From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 29 May 2009 05:57:32 +0000 (-0600)
Subject: Bug #8311: Don't display unknown text parts inline
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=19c8158e6b16b645d636bc97ac2e81f0e71129d1;p=horde.git

Bug #8311: Don't display unknown text parts inline
---

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Simple.php b/framework/Mime/lib/Horde/Mime/Viewer/Simple.php
index aa4a15701..6b3d9b96e 100644
--- a/framework/Mime/lib/Horde/Mime/Viewer/Simple.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/Simple.php
@@ -23,7 +23,7 @@ class Horde_Mime_Viewer_Simple extends Horde_Mime_Viewer_Driver
         'forceinline' => false,
         'full' => true,
         'info' => false,
-        'inline' => true
+        'inline' => false
     );
 
     /**
@@ -41,20 +41,4 @@ class Horde_Mime_Viewer_Simple extends Horde_Mime_Viewer_Driver
             )
         );
     }
-
-    /**
-     * Return the rendered inline version of the Horde_Mime_Part object.
-     *
-     * @return array  See Horde_Mime_Viewer_Driver::render().
-     */
-    protected function _renderInline()
-    {
-        return array(
-            $this->_mimepart->getMimeId() => array(
-                'data' => String::convertCharset($this->_mimepart->getContents(), $this->_mimepart->getCharset()),
-                'status' => array(),
-                'type' => 'text/plain; charset=' . NLS::getCharset()
-            )
-        );
-    }
 }