[Rt-commit] r10354 - in rt/branches/3.6-EXPERIMENTAL-ABERDEEN: .

[audreyt at bestpractical.com]

Author: audreyt
Date: Tue Jan 15 11:52:07 2008
New Revision: 10354

Modified:
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/   (props changed)
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Action/SendEmail.pm
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf

Log:
 r18648 at T (orig r10351):  jesse | 2008-01-15 23:18:19 +0800
  r75056 at pinglin:  jesse | 2008-01-15 10:17:55 -0500
  * Fixed an issue where RT would flub the content-type on mail messages containing non-ascii characters 
    (Bug introduced after 3.6.5 and reported by Sven Sternberger)
 
 r18649 at T (orig r10352):  jesse | 2008-01-15 23:22:58 +0800
  r75058 at pinglin:  jesse | 2008-01-15 10:22:51 -0500
  * bump to rc3
 


Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Action/SendEmail.pm
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Action/SendEmail.pm	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Action/SendEmail.pm	Tue Jan 15 11:52:07 2008
@@ -174,9 +174,11 @@
             push @parts, $part->parts;
         }
         else {
-            $part->head->mime_attr( "Content-Type" => 'text/plain' )
-                unless $part->head->mime_attr('Content-Type')
-                   and RT::I18N::IsTextualContentType($part->mime_type);
+            if ( RT::I18N::IsTextualContentType( $part->mime_type ) ) {
+                $part->head->mime_attr( "Content-Type" => $part->mime_type )
+            } else {
+                $part->head->mime_attr( "Content-Type" => 'text/plain' );
+            }
             $part->head->mime_attr( "Content-Type.charset" => 'utf-8' );
         }
     }

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf	Tue Jan 15 11:52:07 2008
@@ -1,5 +1,5 @@
 PRODUCT			        = rt
-TAG			            = 3.6.6rc2
+TAG			            = 3.6.6rc3
 CANONICAL_REPO		    = svn+ssh://svn.bestpractical.com/svn/bps-public/rt/
 TAGS		            = tags/
 TRUNK	                = branches/3.6-RELEASE