From d2d2cacd0b447d2e4d5f6ae061f06fe09705ec37 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 16 Nov 2009 15:19:12 -0700 Subject: [PATCH] Fix displaying parts under multipart/related as attachments when located in a multipart/related part --- imp/lib/Mime/Viewer/Alternative.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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' => '', -- 2.11.0