Need to add related parts in reverse order, since HTML node traversal…

… is inside-out
horde · Mar 7, 2014 · 50d8dcd · 50d8dcd
1 parent 52230a4
commit 50d8dcd
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
@@ -2617,6 +2617,11 @@ protected function _convertToRelated(Horde_Domhtml $html,
         $related->setContentTypeParameter('start', $part->setContentId());
         $related->addPart($part);
 
+        /* HTML iteration is from child->parent, so need to gather related
+         * parts and add at end after sorting to generate a more sensible
+         * attachment list. */
+        $add = array();
+
         foreach ($html as $node) {
             if (($node instanceof DOMElement) &&
                 $node->hasAttribute(self::RELATED_ATTR)) {
@@ -2628,14 +2633,16 @@ protected function _convertToRelated(Horde_Domhtml $html,
                 } else {
                     $related_part = $r_atc->getPart(true);
                     $attr = 'cid:' . $related_part->setContentId();
-                    $related->addPart($related_part);
+                    $add[] = $related_part;
                 }
 
                 $node->setAttribute($attr_name, $attr);
                 $node->removeAttribute(self::RELATED_ATTR);
             }
         }
 
+        array_map(array($related, 'addPart'), array_reverse($add));
+
         return $related;
     }