Changeset b26e1d2 in github

Timestamp:

Jul 20, 2009 12:54:42 PM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

a07ab6d

Parents:

4307ccd8

Message:

• fix related attachments without linking to message part are not listed (#1485984)

File:

• program/include/rcube_message.php (modified) (1 diff)

program/include/rcube_message.php

@@ -383 +383 @@
             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