From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 18 Nov 2008 18:52:07 +0000 (-0700)
Subject: Fix getEmbeddedMimeParts(). Simplify.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7e9440cd0e00f0011ba08f802464940dec72fbed;p=horde.git

Fix getEmbeddedMimeParts(). Simplify.
---

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Driver.php b/framework/Mime/lib/Horde/Mime/Viewer/Driver.php
index cbaecb379..b7bb63c5f 100644
--- a/framework/Mime/lib/Horde/Mime/Viewer/Driver.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/Driver.php
@@ -120,10 +120,6 @@ class Horde_Mime_Viewer_Driver
      */
     public function render($mode)
     {
-        if (!$this->canRender($mode)) {
-            return array();
-        }
-
         switch ($mode) {
         case 'full':
             return $this->_render();
@@ -225,9 +221,10 @@ class Horde_Mime_Viewer_Driver
      */
     public function getEmbeddedMimeParts()
     {
-        return $this->embeddedMimeParts()
-            ? $this->_getEmbeddedMimeParts()
-            : null;
+        $viewer = $this->_getViewer();
+        return ($viewer)
+            ? $viewer->getEmbeddedMimeParts()
+            : $this->_getEmbeddedMimeParts();
     }
 
     /**
@@ -240,6 +237,7 @@ class Horde_Mime_Viewer_Driver
      */
     protected function _getEmbeddedMimeParts()
     {
+        return null;
     }
 
     /**