Move name information inside first part.

diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php
index 06af04f..2a0570c 100644 (file)
--- a/imp/lib/Contents.php
+++ b/imp/lib/Contents.php
@@ -322,8 +322,8 @@ class IMP_Contents
                 : array();
         }
 
-        if (!isset($ret['name'])) {
-            $ret['name'] = $mime_part->getName(true);
+        if (!empty($ret[$mime_id]) && !isset($ret[$mime_id]['name'])) {
+            $ret[$mime_id]['name'] = $mime_part->getName(true);
         }
 
         /* If this is a text/* part, AND the browser does not support UTF-8,

diff --git a/imp/view.php b/imp/view.php
index f11856c..78f81e0 100644 (file)
--- a/imp/view.php
+++ b/imp/view.php
@@ -115,7 +115,7 @@ case 'download_render':
         $render = $contents->renderMIMEPart($id, Util::getFormData('mode', 'full'), array('type' => $ctype));
         $body = $render[$id]['data'];
         $type = $render[$id]['type'];
-        $name = $render['name'];
+        $name = $render[$id]['name'];
         break;
     }
 
@@ -136,7 +136,7 @@ case 'download_render':
 
 case 'view_attach':
     $render = $contents->renderMIMEPart($id, Util::getFormData('mode', 'full'), array('type' => $ctype));
-    $browser->downloadHeaders($render['name'], $render[$id]['type'], true, strlen($render[$id]['data']));
+    $browser->downloadHeaders($render[$id]['name'], $render[$id]['type'], true, strlen($render[$id]['data']));
     echo $render[$id]['data'];
     exit;