diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-31 09:13:11 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-31 09:13:11 +0000 |
| commit | acb45af886419a744639d555bfe80b883fa00231 (patch) | |
| tree | 26eb3a87dee3a043679b42122664f8148e7665f2 | |
| parent | 1054382d402054625039730b6f36a2f2e36fd251 (diff) | |
- revert r2819 commit removed in last commit
git-svn-id: https://svn.roundcube.net/trunk@2823 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index d82c8ef71..dd7b38815 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -688,16 +688,18 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) $html = preg_replace_callback('/(<[\/!]*)([^ >]+)/', 'rcmail_html_tag_callback', $html); // charset was converted to UTF-8 in rcube_imap::get_message_part(), - // change charset specification in HTML accordingly - $charset_pattern = '/(\s+content=[\'"]?\w+\/\w+;\s*charset)=([a-z0-9-_]+)/i'; - if (preg_match($charset_pattern, $html)) { - $html = preg_replace($charset_pattern, '\\1='.RCMAIL_CHARSET, $html); + // -> 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); } - // add head for malformed messages, washtml cannot work without that - if (!preg_match('/<head[^>]*>(.*)<\/head>/Uims', $html)) - $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); - + else { + // add meta content-type to malformed messages, washtml cannot work without that + if (!preg_match('/<head[^>]*>(.*)<\/head>/Uims', $html)) + $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); |