From 7acda34070dbd8fd2033bdcdbcf41c7ad7474372 Mon Sep 17 00:00:00 2001 From: alec Date: Mon, 20 Jul 2009 16:54:42 +0000 Subject: - fix related attachments without linking to message part are not listed (#1485984) git-svn-id: https://svn.roundcube.net/trunk@2774 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_message.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'roundcubemail/program') diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php index 9fe9858c3..374dc9059 100644 --- a/roundcubemail/program/include/rcube_message.php +++ b/roundcubemail/program/include/rcube_message.php @@ -382,16 +382,15 @@ class rcube_message 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 { -- cgit v1.2.3