diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-08-06 16:00:01 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-08-06 16:00:01 +0000 |
| commit | a17fb8ccebff21c8235d2b9e81530926d02402c3 (patch) | |
| tree | 89a700753d199213ef9849eb20f4c5afa9105b9d | |
| parent | 985484520941395d87f8865f3ddeb5d9aa6d1a78 (diff) | |
- fix charset modification in html messages (#1486031)
git-svn-id: https://svn.roundcube.net/trunk@2842 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 dd7b38815..ca2b05425 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -689,9 +689,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 = '(content=[\'"]?\w+\/\w+;\s*charset)=([a-z0-9-_]+)'; - if (preg_match("/<meta\s+[^>]*$charset_pattern/Ui", $html)) { - $html = preg_replace("/\s+$charset_pattern/i", '\\1='.RCMAIL_CHARSET, $html); + $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); } else { // add meta content-type to malformed messages, washtml cannot work without that @@ -699,7 +699,6 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) $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); @@ -720,6 +719,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) $wash_opts['html_elements'][] = 'link'; $wash_opts['html_attribs'] = array('rel','type'); } +console($html); $washer = new washtml($wash_opts); $washer->add_callback('form', 'rcmail_washtml_callback'); |