From f4bf206fd45a8ab6b61a8869eba3165e430bb04e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 06 Aug 2009 12:00:01 -0400
Subject: [PATCH] - fix charset modification in html messages (#1486031)

---
 program/steps/mail/func.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index dd7b388..ca2b054 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -689,9 +689,9 @@
 
   // charset was converted to UTF-8 in rcube_imap::get_message_part(),
   // -> change charset specification in HTML accordingly
-  $charset_pattern = '(content=[\'"]?\w+\/\w+;\s*charset)=([a-z0-9-_]+)';
-  if (preg_match("/<meta\s+[^>]*$charset_pattern/Ui", $html)) {
-    $html = preg_replace("/\s+$charset_pattern/i", '\\1='.RCMAIL_CHARSET, $html);
+  $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);
   }
   else {
     // add meta content-type to malformed messages, washtml cannot work without that
@@ -699,7 +699,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);
 
@@ -720,6 +719,7 @@
     $wash_opts['html_elements'][] = 'link';
     $wash_opts['html_attribs'] = array('rel','type');
   }
+console($html);  
     
   $washer = new washtml($wash_opts);
   $washer->add_callback('form', 'rcmail_washtml_callback');

--
Gitblit v1.9.1