- fix related attachments without linking to message part are not listed (#1485984)

release-0.6
alecpl 16 years ago
parent 4307ccd82b
commit b26e1d23a0

@ -382,17 +382,16 @@ class rcube_message
if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
continue; continue;
// part belongs to a related message // part belongs to a related message and is linked
if ($message_ctype_secondary == 'related') { if ($message_ctype_secondary == 'related'
&& ($mail_part->headers['content-id'] || $mail_part->headers['content-location'])) {
if ($mail_part->headers['content-id']) if ($mail_part->headers['content-id'])
$mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']); $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
if ($mail_part->headers['content-location']) if ($mail_part->headers['content-location'])
$mail_part->content_location = $mail_part->headers['content-base'] . $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 // is a regular attachment
else { else {
if (!$mail_part->filename) if (!$mail_part->filename)

Loading…
Cancel
Save