Changeset 659672e in github

Timestamp:

Jul 30, 2009 12:07:26 AM (4 years ago)

Author:

svncommit <devs@…>

Branches:

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

Children:

9d88bf7

Parents:

2e63d30

Message:

fix washing of HTML encoded in something other than UTF-8

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/washtml.php (modified) (1 diff)

CHANGELOG

@@ -6 +6 @@
 - 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

program/lib/washtml.php

@@ -247 +247 @@
     $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);