From 9047076ac352c86e2225619eced3b79804a2673b Mon Sep 17 00:00:00 2001
From: estadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 30 Jul 2009 04:07:26 +0000
Subject: fix washing of HTML encoded in something other than UTF-8

git-svn-id: https://svn.roundcube.net/trunk@2810 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/lib/washtml.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'roundcubemail/program/lib')

diff --git a/roundcubemail/program/lib/washtml.php b/roundcubemail/program/lib/washtml.php
index efd525df3..57145a179 100644
--- a/roundcubemail/program/lib/washtml.php
+++ b/roundcubemail/program/lib/washtml.php
@@ -246,6 +246,7 @@ class washtml
     //Charset seems to be ignored (probably if defined in the HTML document)
     $node = new DOMDocument('1.0', $this->config['charset']);
     $this->extlinks = false;
+    $html = mb_convert_encoding($html, 'HTML-ENTITIES', $this->config['charset']);
     @$node->loadHTML($html);
     return $this->dumpHtml($node);
   }
-- 
cgit v1.2.3