diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-03-09 11:23:35 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-03-09 11:23:35 +0000 |
| commit | 6d74e5e0be67eb7043843a0a605b043253e81f5c (patch) | |
| tree | 7a6ab8f175ca042fa94094a04735327f1c4a779e | |
| parent | c813ba39bbc7e966bec4215baa9387452bfd500d (diff) | |
- Improved charset replacement in html meta header (#1486542)
git-svn-id: https://svn.roundcube.net/trunk@3342 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 3dab087b0..3777dfded 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -682,13 +682,13 @@ function rcmail_check_safe(&$message) function rcmail_wash_html($html, $p = array(), $cid_replaces) { global $REMOTE_OBJECTS; - + $p += array('safe' => false, 'inline_html' => true); // special replacements (not properly handled by washtml class) $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 ); @@ -705,9 +705,9 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) // 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 { // add meta content-type to malformed messages, washtml cannot work without that |