From b26e1d23a0ba96696ddebd7f3d61431eb0b0d957 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 20 Jul 2009 12:54:42 -0400
Subject: [PATCH] - fix related attachments without linking to message part are not listed (#1485984)

---
 program/include/rcube_message.php |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 9fe9858..374dc90 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -382,16 +382,15 @@
           if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
             continue;
 
-          // part belongs to a related message
-          if ($message_ctype_secondary == 'related') {
+          // part belongs to a related message and is linked
+          if ($message_ctype_secondary == 'related'
+	      && ($mail_part->headers['content-id'] || $mail_part->headers['content-location'])) {
             if ($mail_part->headers['content-id'])
               $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
             if ($mail_part->headers['content-location'])
               $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
-            
-            if ($mail_part->content_id || $mail_part->content_location) {
-              $this->inline_parts[] = $mail_part;
-            }
+    
+            $this->inline_parts[] = $mail_part;
           }
           // is a regular attachment
           else {

--
Gitblit v1.9.1