banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fix charset replacement in HTML message bodies (#1487021)

Browse Source
release-0.6
alecpl 14 years ago
parent 1f49ce50a9
commit 66c674cc57
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

1
CHANGELOG
Unescape Escape View File

@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
- Allow setting some washtml options from plugin (#1486578) - Allow setting some washtml options from plugin (#1486578)
- Add option do bind for an individual LDAP address book (#1486997) - 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) - 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 RELEASE 0.4.1
------------- -------------

3
program/steps/mail/func.inc
Unescape Escape View File

@ -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(), // charset was converted to UTF-8 in rcube_imap::get_message_part(),
// -> change charset specification in HTML accordingly // -> 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)) { 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);
} }
@ -673,7 +673,6 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces)
$html = '<head></head>'. $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); $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 // turn relative into absolute urls
$html = rcmail_resolve_base($html); $html = rcmail_resolve_base($html);

Write Preview
Loading…
Cancel
Save