Changeset 3504594 in github for program/steps/mail/func.inc

Timestamp:

Jun 7, 2008 8:51:21 AM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

c8fb2b7

Parents:

c3ab7537

Message:

Change meta-charset specififcation in HTML to UTF-8; no need for mb_convert_encoding() anymore

File:

• program/steps/mail/func.inc (modified) (1 diff)

program/steps/mail/func.inc

@@ -535 +535 @@
   // 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);