Fix bad encoding when parsing HTML data

diff --git a/framework/Text_Filter/lib/Horde/Text/Filter/Xss.php b/framework/Text_Filter/lib/Horde/Text/Filter/Xss.php
index 0dc9d3c..4569718 100644 (file)
--- a/framework/Text_Filter/lib/Horde/Text/Filter/Xss.php
+++ b/framework/Text_Filter/lib/Horde/Text/Filter/Xss.php
@@ -106,6 +106,11 @@ class Horde_Text_Filter_Xss extends Horde_Text_Filter_Base
         $old_error = libxml_use_internal_errors(true);
         $doc = new DOMDocument();
         $doc->loadHTML($text);
+        if (!$doc->encoding) {
+            /* If libxml can't auto-detect encoding, convert to ISO-8859-1
+             * manually. */
+            $doc->loadHTML(Horde_String::convertCharset($text, $this->_params['charset'], 'ISO-8859-1'));
+        }
         if ($old_error) {
             libxml_use_internal_errors(false);
         }