Ticket #9201: Better to convert things to UTF-8, to prevent lossy conversion.

diff --git a/framework/Support/lib/Horde/Support/Domhtml.php b/framework/Support/lib/Horde/Support/Domhtml.php
index 61b9127..060e58b 100644 (file)
--- a/framework/Support/lib/Horde/Support/Domhtml.php
+++ b/framework/Support/lib/Horde/Support/Domhtml.php
@@ -59,8 +59,8 @@ class Horde_Support_Domhtml
 
         if (!is_null($charset)) {
             if (!$doc->encoding) {
-                $doc->loadHTML(Horde_String::convertCharset($text, $charset, 'ISO-8859-1'));
-                $this->encoding = null;
+                $doc->loadHTML('<?xml encoding="UTF-8">' . Horde_String::convertCharset($text, $charset, 'UTF-8'));
+                $this->encoding = 'UTF-8';
             } elseif ($doc->encoding != $charset) {
                 /* If libxml can't auto-detect encoding, convert to what it
                  * *thinks* the encoding should be. */