From: Chuck Hagenbuch <chuck@horde.org>
Date: Sun, 12 Sep 2010 03:36:41 +0000 (-0400)
Subject: The base HTML Mime_Viewer wasn't working for me without these changes
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b5f8d465ac878766cd542c788aee8ae03863e4d3;p=horde.git

The base HTML Mime_Viewer wasn't working for me without these changes
---

diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php
index 6c3276df8..b0094d20b 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php
@@ -81,7 +81,7 @@ class Horde_Mime_Viewer_Html extends Horde_Mime_Viewer_Base
         $html = $this->_cleanHTML($this->_mimepart->getContents(), array('inline' => false));
 
         return $this->_renderReturn(
-            $html['html'],
+            $html,
             $this->_mimepart->getType(true)
         );
     }
@@ -96,11 +96,9 @@ class Horde_Mime_Viewer_Html extends Horde_Mime_Viewer_Base
         $html = $this->_cleanHTML($this->_mimepart->getContents(), array('inline' => true));
 
         return array(
-            $this->_mimepart->getMimeId() => array(
-                'data' => Horde_String::convertCharset($html['data'], $this->_mimepart->getCharset(), $this->getConfigParam('charset')),
-                'status' => $html['status'],
-                'type' => 'text/html; charset=' . $this->getConfigParam('charset')
-            )
+            'data' => Horde_String::convertCharset($html, $this->_mimepart->getCharset(), $this->getConfigParam('charset')),
+            'status' => array(),
+            'type' => 'text/html; charset=' . $this->getConfigParam('charset'),
         );
     }