From 699d059d4fa0faeed9273862ce3e19474bb8fd2d Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 25 Aug 2010 13:25:52 -0600 Subject: [PATCH] Ticket #9201: Better to convert things to UTF-8, to prevent lossy conversion. --- framework/Support/lib/Horde/Support/Domhtml.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/Support/lib/Horde/Support/Domhtml.php b/framework/Support/lib/Horde/Support/Domhtml.php index 61b9127ef..060e58b9a 100644 --- 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('' . 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. */ -- 2.11.0