From: jangliss <jangliss@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 22 Nov 2009 16:19:52 +0000 (+0000)
Subject: Fix issue with multi-part related messages not showing all attachments (#2830140).
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=780555e6c75c4f873599902f07a7ab94291ccf1c;p=squirrelmail.git

Fix issue with multi-part related messages not showing all attachments (#2830140).

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13874 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/class/mime/Message.class.php b/class/mime/Message.class.php
index c7bac30b..ae03ecd4 100644
--- a/class/mime/Message.class.php
+++ b/class/mime/Message.class.php
@@ -1123,8 +1123,7 @@ class Message {
                 }
 
                 if (!$exclude) {
-                    if (($entity->type0 == 'multipart') &&
-                        ($entity->type1 != 'related')) {
+                    if ($entity->type0 == 'multipart') {
                         $result = $entity->getAttachments($exclude_id, $result);
                     } else if ($entity->type0 != 'multipart') {
                         $result[] = $entity;
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 6b71e3a7..3d8a0f8c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -324,6 +324,7 @@ Version 1.5.2 - SVN
   - Remove personal data from Message ID seed. (#880029/847107)
   - Implemented page referal verification mechanism. (Secunia Advisory SA34627)
   - Implemented security token system. (Secunia Advisory SA34627)
+  - Fix issue with multi-part related messages not showing all attachments (#2830140).
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------