Multipart/related inline fixes

Multipart/related parts should show the base part in the inline screen,
rather than the viewable internal part. We want the link associated with
the inline data to view the full related message, rather than a
particular subpart.

diff --git a/imp/lib/Mime/Viewer/Related.php b/imp/lib/Mime/Viewer/Related.php
index 4a491a0..2a84d60 100644 (file)
--- a/imp/lib/Mime/Viewer/Related.php
+++ b/imp/lib/Mime/Viewer/Related.php
@@ -90,15 +90,28 @@ class IMP_Horde_Mime_Viewer_Related extends Horde_Mime_Viewer_Driver
             return array();
         }
 
-
         $render = $this->_params['contents']->renderMIMEPart($id, $inline ? IMP_Contents::RENDER_INLINE : IMP_Contents::RENDER_FULL, array('params' => array_merge($this->_params, array('related_id' => $id, 'related_cids' => $cids))));
 
         if (!$inline) {
             return $render;
         }
 
+        $data_id = null;
         foreach (array_keys($render) as $val) {
             $ret[$val] = $render[$val];
+            if ($ret[$val]) {
+                $data_id = $val;
+            }
+        }
+
+        /* We want the inline display to show multipart/related vs. the
+         * viewable MIME part.  This is because a multipart/related part is
+         * not downloadable and clicking on the MIME part may not produce the
+         * desired result in the full display (i.e. HTML parts with related
+         * images). */
+        if (!is_null($data_id) && ($data_id !== $related_id)) {
+            $ret[$related_id] = $ret[$data_id];
+            $ret[$data_id] = null;
         }
 
         return $ret;