diff options
| author | thomascube <thomas@roundcube.net> | 2010-10-06 08:02:47 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2010-10-06 08:02:47 +0000 |
| commit | cb8ebfcbf8cf72f1aeb44b4fcdd62e071cc00368 (patch) | |
| tree | f66c22e0411b469e0fdbfb62ff582669c9aba46b /program/steps/mail/func.inc | |
| parent | cecf83a48d3bde732f5cffacd0499f67ff23254c (diff) | |
Hotfixes for release 0.4.1 building new 0.4.2 version
Diffstat (limited to 'program/steps/mail/func.inc')
| -rw-r--r-- | program/steps/mail/func.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 119a5da31..0d12a5bde 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -661,7 +661,7 @@ 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); } @@ -671,7 +671,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); |