From 8ab864973b328a3ebcae573f32e3b7f0bf2d669f Mon Sep 17 00:00:00 2001 From: thomasb Date: Mon, 1 Dec 2008 20:15:50 +0000 Subject: Insert meta content-type at top of the html head + add both content-id and content-location of related parts to replacement table git-svn-id: https://svn.roundcube.net/trunk@2106 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_message.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'roundcubemail/program/include') diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php index 9aff68b52..75c47dfe0 100644 --- a/roundcubemail/program/include/rcube_message.php +++ b/roundcubemail/program/include/rcube_message.php @@ -373,14 +373,14 @@ class rcube_message // skip apple resource forks if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') continue; - - // part belongs to a related message - if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id']) { + + if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id']) $mail_part->content_id = preg_replace(array('/^$/'), '', $mail_part->headers['content-id']); - $this->inline_parts[] = $mail_part; - } - else if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location']) { + 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; } // is regular attachment -- cgit v1.2.3