Changeset 3342 in subversion for trunk/roundcubemail/program/steps/mail/func.inc

Timestamp:

Mar 9, 2010 6:23:35 AM (3 years ago)

Author:

alec

Message:

• Improved charset replacement in html meta header (#1486542)

File:

• trunk/roundcubemail/program/steps/mail/func.inc (modified) (3 diffs)

trunk/roundcubemail/program/steps/mail/func.inc

@@ -683 +683 @@
 {
   global $REMOTE_OBJECTS;
-  
+
   $p += array('safe' => false, 'inline_html' => true);
 
@@ -689 +689 @@
   $html_search = array(
     '/(<\/nobr>)(\s+)(<nobr>)/i',       // space(s) between <NOBR>
-    '/<title[^>]*>.*<\/title>/i',               // PHP bug #32547 workaround: remove title tag
+    '/<title[^>]*>.*<\/title>/i',       // PHP bug #32547 workaround: remove title tag
     '/^(\0\0\xFE\xFF|\xFF\xFE\0\0|\xFE\xFF|\xFF\xFE|\xEF\xBB\xBF)/',    // byte-order mark (only outlook?)
     '/<html\s[^>]+>/i',                 // washtml/DOMDocument cannot handle xml namespaces
@@ -706 +706 @@
   // 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);
+    $html = preg_replace("/$charset_pattern/i", '\\1"\\2'.RCMAIL_CHARSET.'"', $html);
   }
   else {