Short circuit if we have an attachment disposition.

horde · Aug 6, 2015 · 42a3933 · 42a3933
1 parent a1e2c8a
commit 42a3933
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Imap/MessageBodyData.php b/framework/ActiveSync/lib/Horde/ActiveSync/Imap/MessageBodyData.php
@@ -250,7 +250,6 @@ protected function _getParts()
             $html_id = $this->_basePart->findBody('html');
         }
 
-
         // Deduce which part(s) we need to request.
         $want_html_text = $this->_wantHtml();
         $want_plain_text = $this->_wantPlainText($html_id, $want_html_text);

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Mime.php b/framework/ActiveSync/lib/Horde/ActiveSync/Mime.php
@@ -122,9 +122,14 @@ public function hasAttachments()
      * @param string $mime_type  The MIME type.
      *
      * @return boolean  True if an attachment.
+     * @todo Pass a single mime part as parameter.
      */
     public function isAttachment($id, $mime_type)
     {
+        if ($this->_base->getPart($id)->getDisposition() == 'attachment') {
+            return true;
+        }
+
         switch ($mime_type) {
         case 'text/plain':
             if (!($this->_base->findBody('plain') == $id)) {