Changeset 1736 in subversion for trunk/roundcubemail/program/include/rcube_message.php

Timestamp:

Sep 5, 2008 5:29:06 AM (5 years ago)

Author:

thomasb

Message:

Respect Content-Location headers in multipart/related messages (#1484946)

File:

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

trunk/roundcubemail/program/include/rcube_message.php

@@ -357 +357 @@
             $this->inline_parts[] = $mail_part;
           }
+          else if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location']) {
+            $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
+            $this->inline_parts[] = $mail_part;
+          }
           // is regular attachment
           else {
@@ -371 +375 @@
 
         foreach ($this->inline_parts as $inline_object) {
-          $a_replaces['cid:'.$inline_object->content_id] = $this->get_part_url($inline_object->mime_id);
+          $part_url = $this->get_part_url($inline_object->mime_id);
+          if ($inline_object->content_id)
+            $a_replaces['cid:'.$inline_object->content_id] = $part_url;
+          if ($inline_object->content_location)
+            $a_replaces[$inline_object->content_location] = $part_url;
         }