From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 6 Aug 2010 18:45:21 +0000 (-0600)
Subject: Use charset param
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a8a7f6742e95a1062c71aa54f3c04debdcf30cfe;p=horde.git

Use charset param
---

diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php
index 3e45cd918..157a868e8 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php
@@ -120,7 +120,7 @@ class Horde_Mime_Viewer_Html extends Horde_Mime_Viewer_Base
 
         $data = Horde_Text_Filter::filter($data, array('cleanhtml', 'xss'), array(
             array(
-                'charset' => isset($options['charset']) ? $options['charset'] : $this->_mimepart->getCharset()
+                'charset' => $charset
             ),
             array(
                 'noprefetch' => !empty($options['noprefetch']),