We explicitly mark signature parts as not attachments.

Move the disposition check after the check for this.
horde · Aug 7, 2015 · 0faeca0 · 0faeca0
1 parent 543d4db
commit 0faeca0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Mime.php b/framework/ActiveSync/lib/Horde/ActiveSync/Mime.php
@@ -126,10 +126,6 @@ public function hasAttachments()
      */
     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)) {
@@ -146,6 +142,10 @@ public function isAttachment($id, $mime_type)
             return false;
         }
 
+        if ($this->_base->getPart($id)->getDisposition() == 'attachment') {
+            return true;
+        }
+
         list($ptype,) = explode('/', $mime_type, 2);
 
         switch ($ptype) {