From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 10 Feb 2010 17:58:00 +0000 (-0700)
Subject: Don't display PGP armored text data as separate part.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9ea2adfd52697fa84390a621cbf4017d7d52170c;p=horde.git

Don't display PGP armored text data as separate part.
---

diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php
index f921f1290..c2646529a 100644
--- a/imp/lib/Contents.php
+++ b/imp/lib/Contents.php
@@ -477,7 +477,8 @@ class IMP_Contents
 
         if (($textmode == 'inline') &&
             !strlen($ret[$mime_id]['data']) &&
-            $this->isAttachment($type)) {
+            $this->isAttachment($type) &&
+            !$viewer->embeddedMimeParts()) {
             if (empty($ret[$mime_id]['status'])) {
                 $ret[$mime_id]['status'] = array(
                     array(
diff --git a/imp/lib/Mime/Viewer/Plain.php b/imp/lib/Mime/Viewer/Plain.php
index 5e03c206c..c8d80fd30 100644
--- a/imp/lib/Mime/Viewer/Plain.php
+++ b/imp/lib/Mime/Viewer/Plain.php
@@ -58,7 +58,7 @@ class IMP_Horde_Mime_Viewer_Plain extends Horde_Mime_Viewer_Plain
         $mime_id = $this->_mimepart->getMimeId();
 
         if (isset(self::$_cache[$mime_id])) {
-            return null;
+            return array($mime_id => null);
         }
 
         // Trim extra whitespace in the text.