From 350459486d421675cb63ebdedf5b7d0cf3ceeb99 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 7 Jun 2008 12:51:21 +0000
Subject: Change meta-charset specififcation in HTML to UTF-8; no need for
 mb_convert_encoding() anymore

---
 program/steps/mail/func.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'program/steps/mail')

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 79a84ccb4..f4b18411e 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -534,12 +534,15 @@ function rcmail_print_body($part, $safe=false, $plain=false)
   }
   // text/html
   else if ($part->ctype_secondary == 'html') {
+    // charset was converted to UTF-8 in rcube_imap::get_message_part() -> change charset specification in HTML accordingly
+    $html = preg_replace('/(\s+content=[\'"]\w+\/\w+;\s+charset)=([a-z0-9-]+)/i', '\\1='.RCMAIL_CHARSET, $part->body);
+    
     // clean HTML with washhtml by Frederic Motte
-    $body = washtml::wash($part->body, array(
+    $body = washtml::wash($html, array(
       'show_washed' => false,
       'allow_remote' => $safe,
       'blocked_src' => "./program/blocked.gif",
-      'charset' => 'UTF-8',
+      'charset' => RCMAIL_CHARSET,
       'cid_map' => $part->replaces,
       ), $full_inline);
 
-- 
cgit v1.2.3