Changeset 9e8a175 in github for program/include/rcube_message.php

Timestamp:

Dec 8, 2008 2:42:31 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:

832a7da

Parents:

b754889

Message:

#1485616: read content-id/content-location only for multipart/related type

File:

• program/include/rcube_message.php (modified) (2 diffs)

program/include/rcube_message.php

@@ -351 +351 @@
             $this->parts[] = $mail_part;
           }
-          
+
           // list as attachment as well
           if (!empty($mail_part->filename))
@@ -374 +374 @@
           if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
             continue;
+
+          // part belongs to a related message
+          if ($message_ctype_secondary == 'related') {
+            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 ($message_ctype_secondary == 'related' && $mail_part->headers['content-id'])
-            $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
-          if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location'])
-            $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
-            
-          // part belongs to a related message
-          if ($mail_part->content_id || $mail_part->content_location) {
-            $this->inline_parts[] = $mail_part;
-          }
+            if ($mail_part->content_id || $mail_part->content_location) {
+              $this->inline_parts[] = $mail_part;
+            }
+          }
           // is regular attachment
           else {