summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-09-30 10:07:53 +0000
committeralecpl <alec@alec.pl>2010-09-30 10:07:53 +0000
commit66c674cc5716364cd6b450d8398b0a26aba0a2ae (patch)
tree43d13e57b63a73a9b21e04758de3e4ac558c3c34 /program
parent1f49ce50a9ca23da16fe2a1c512bded3d1cb9c07 (diff)
- Fix charset replacement in HTML message bodies (#1487021)
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/func.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 041eed1db..2bb2dc884 100644
--- a/program/steps/mail/func.inc
+++ b/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);