From 66c674cc5716364cd6b450d8398b0a26aba0a2ae Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 30 Sep 2010 06:07:53 -0400
Subject: [PATCH] - Fix charset replacement in HTML message bodies (#1487021)
---
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 041eed1..2bb2dc8 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -663,7 +663,7 @@
// 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 @@
$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);
--
Gitblit v1.9.1