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

trac at roundcube.net trac at roundcube.net
Thu Sep 30 12:07:53 CEST 2010


Author: alec
Date: 2010-09-30 05:07:53 -0500 (Thu, 30 Sep 2010)
New Revision: 4024

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/steps/mail/func.inc
Log:
- Fix charset replacement in HTML message bodies (#1487021)


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2010-09-30 09:11:33 UTC (rev 4023)
+++ trunk/roundcubemail/CHANGELOG	2010-09-30 10:07:53 UTC (rev 4024)
@@ -11,6 +11,7 @@
 - Allow setting some washtml options from plugin (#1486578)
 - Add option do bind for an individual LDAP address book (#1486997)
 - Change reply prefix to display email address only if sender name doesn't exist (#1486550)
+- Fix charset replacement in HTML message bodies (#1487021)
 
 RELEASE 0.4.1
 -------------

Modified: trunk/roundcubemail/program/steps/mail/func.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/func.inc	2010-09-30 09:11:33 UTC (rev 4023)
+++ trunk/roundcubemail/program/steps/mail/func.inc	2010-09-30 10:07:53 UTC (rev 4024)
@@ -663,7 +663,7 @@
 
   // charset was converted to UTF-8 in rcube_imap::get_message_part(),
   // -> change charset specification in HTML accordingly
-  $charset_pattern = '(<meta\s+[^>]* content=)[\'"]?(\w+\/\w+;\s*charset=)([a-z0-9-_]+[\'"]?)';
+  $charset_pattern = '(<meta\s+[^>]*content=)[\'"]?(\w+\/\w+;\s*charset=)([a-z0-9-_]+[\'"]?)';
   if (preg_match("/$charset_pattern/Ui", $html)) {
     $html = preg_replace("/$charset_pattern/i", '\\1"\\2'.RCMAIL_CHARSET.'"', $html);
   }
@@ -673,7 +673,6 @@
       $html = '<head></head>'. $html;
     $html = substr_replace($html, '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '<head>')+6), 0);
   }
-
   // turn relative into absolute urls
   $html = rcmail_resolve_base($html);
 

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



More information about the Svn mailing list