summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-07-20 16:54:42 +0000
committeralecpl <alec@alec.pl>2009-07-20 16:54:42 +0000
commitb26e1d23a0ba96696ddebd7f3d61431eb0b0d957 (patch)
treed6a9270193714f93bf88c7e03586657283b44653 /program
parent4307ccd82b259e22d65a9468b71cfe5786a456de (diff)
- fix related attachments without linking to message part are not listed (#1485984)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_message.php11
1 files changed, 5 insertions, 6 deletions
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 9fe9858c3..374dc9059 100644
--- a/program/include/rcube_message.php
+++ b/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 {