[Svn] r4232 - in trunk/roundcubemail: . program/include program/steps/mail

trac at roundcube.net trac at roundcube.net
Thu Nov 18 11:34:10 CET 2010


Author: alec
Date: 2010-11-18 04:34:10 -0600 (Thu, 18 Nov 2010)
New Revision: 4232

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/include/rcube_shared.inc
   trunk/roundcubemail/program/steps/mail/sendmail.inc
Log:
- Don't set attachment's charset in Content-type header (#1487122)


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2010-11-17 13:35:58 UTC (rev 4231)
+++ trunk/roundcubemail/CHANGELOG	2010-11-18 10:34:10 UTC (rev 4232)
@@ -73,6 +73,7 @@
 - Fix focused elements aren't unfocused when clicking on the list (#1487123)
 - Fix error in MSSQL DDL scripts (#1487112)
 - Lock submit button in onsubmit event on login page (#1487036)
+- Don't set attachment's charset in Content-type header (#1487122)
 
 RELEASE 0.4.2
 -------------

Modified: trunk/roundcubemail/program/include/rcube_shared.inc
===================================================================
--- trunk/roundcubemail/program/include/rcube_shared.inc	2010-11-17 13:35:58 UTC (rev 4231)
+++ trunk/roundcubemail/program/include/rcube_shared.inc	2010-11-18 10:34:10 UTC (rev 4232)
@@ -477,9 +477,9 @@
         $mime_type = $failover;
     }
     else {
-        // sometimes content-type contains charset definition,
-        // remove useless "charset=binary", should we remove any charset def. here?
-        $mime_type = preg_replace('/; charset=binary;*/i', '', $mime_type);
+        // Sometimes (PHP-5.3?) content-type contains charset definition,
+        // Remove it (#1487122) also "charset=binary" is useless
+        $mime_type = array_shift(preg_split('/[; ]/', $mime_type));
     }
 
     return $mime_type;

Modified: trunk/roundcubemail/program/steps/mail/sendmail.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/sendmail.inc	2010-11-17 13:35:58 UTC (rev 4231)
+++ trunk/roundcubemail/program/steps/mail/sendmail.inc	2010-11-18 10:34:10 UTC (rev 4232)
@@ -503,7 +503,7 @@
         ($attachment['data'] ? false : true),
         ($ctype == 'message/rfc822' ? '8bit' : 'base64'),
         ($ctype == 'message/rfc822' ? 'inline' : 'attachment'),
-        $message_charset, '', '', 
+        '', '', '',
         $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL,
         $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL
       );

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list