diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-09-30 10:07:53 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-09-30 10:07:53 +0000 |
| commit | 605d7c0bf292a12909ef8384854d5668a8d500bf (patch) | |
| tree | 9e4ad4b072aa3f37d3cedd7ef5c99b13e9960728 /roundcubemail | |
| parent | c40537d71946b4e1782dcff914dff665ad3864ac (diff) | |
- Fix charset replacement in HTML message bodies (#1487021)
git-svn-id: https://svn.roundcube.net/trunk@4024 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index a120ae0be..9a9bb5af1 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail - Allow setting some washtml options from plugin (#1486578) - Add option do bind for an individual LDAP address book (#1486997) - Change reply prefix to display email address only if sender name doesn't exist (#1486550) +- Fix charset replacement in HTML message bodies (#1487021) RELEASE 0.4.1 ------------- diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 041eed1db..2bb2dc884 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -663,7 +663,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); } @@ -673,7 +673,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); |