Fix resuming when message consists entirely of attachment data

horde · Dec 1, 2014 · 7548c33 · 7548c33
1 parent b8cf9c7
commit 7548c33
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
@@ -465,7 +465,7 @@ public function useTemplate($indices, array $opts = array())
      */
     protected function _resumeDraft($indices, $type, $opts)
     {
-        global $injector, $prefs;
+        global $injector, $notification, $prefs;
 
         $contents_factory = $injector->getInstance('IMP_Factory_Contents');
 
@@ -550,22 +550,29 @@ protected function _resumeDraft($indices, $type, $opts)
         $mime_message = $contents->getMIMEMessage();
 
         /* Add attachments. */
+        $parts = array();
         if (($mime_message->getPrimaryType() == 'multipart') &&
             ($mime_message->getType() != 'multipart/alternative')) {
             for ($i = 1; ; ++$i) {
                 if (intval($text_id) == $i) {
                     continue;
                 }
 
-                if (!($part = $contents->getMimePart($i))) {
+                if ($part = $contents->getMimePart($i)) {
+                    $parts[] = $part;
+                } else {
                     break;
                 }
+            }
+        } elseif ($mime_message->getDisposition() == 'attachment') {
+            $parts[] = $contents->getMimePart('1');
+        }
 
-                try {
-                    $this->addAttachmentFromPart($part);
-                } catch (IMP_Compose_Exception $e) {
-                    $GLOBALS['notification']->push($e, 'horde.warning');
-                }
+        foreach ($parts as $val) {
+            try {
+                $this->addAttachmentFromPart($val);
+            } catch (IMP_Compose_Exception $e) {
+                $notification->push($e, 'horde.warning');
             }
         }