diff options
| author | estadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-30 04:07:26 +0000 |
|---|---|---|
| committer | estadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-30 04:07:26 +0000 |
| commit | 9047076ac352c86e2225619eced3b79804a2673b (patch) | |
| tree | fd52f8ecbc76cbd46492fc34e5a4499940b1b5ce | |
| parent | d3c1f453bb38f8c918eb34b3f86b211f2281e9f6 (diff) | |
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
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/lib/washtml.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 4acc9775a..8c6a5d132 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -5,6 +5,7 @@ CHANGELOG RoundCube Webmail - Speedup UI by using sprites for (toolbar) buttons - Fix charset names with X- prefix handling - Fix displaying of HTML messages with unknown/malformed tags (#1486003) +- Fix HTML washing of non-UTF8 messages RELEASE 0.3-RC1 --------------- 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); } |