From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 16 Nov 2009 22:19:12 +0000 (-0700)
Subject: Fix displaying parts under multipart/related as attachments when located in a multipa... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d2d2cacd0b447d2e4d5f6ae061f06fe09705ec37;p=horde.git

Fix displaying parts under multipart/related as attachments when located in a multipart/related part
---

diff --git a/imp/lib/Mime/Viewer/Alternative.php b/imp/lib/Mime/Viewer/Alternative.php
index c65ab7bea..b77998212 100644
--- a/imp/lib/Mime/Viewer/Alternative.php
+++ b/imp/lib/Mime/Viewer/Alternative.php
@@ -111,7 +111,9 @@ class IMP_Horde_Mime_Viewer_Alternative extends Horde_Mime_Viewer_Driver
                     $ret[$id] = $render[$id];
                     unset($display_ids[$id]);
                 }
-            } elseif ($disp_id != $val) {
+            } elseif (($disp_id != $val) && !array_key_exists($val, $ret)) {
+                // Need array_key_exists() here since we are checking if the
+                // key exists AND is null.
                 $ret[$val] = array(
                     'attach' => true,
                     'data' => '',