Fix bug where a message/rfc822 part without a filename wasn't listed on the attachments list (#6494)

pull/6499/head
Aleksander Machniak 6 years ago
parent 09c9443a54
commit 7b203cbc52

@ -25,6 +25,7 @@ CHANGELOG Roundcube Webmail
- Fix so invalid smtp_helo_host is never used, fallback to localhost (#6408)
- Fix custom logo size in Elastic (#6424)
- Fix listing the same attachment multiple times on forwarded messages
- Fix bug where a message/rfc822 part without a filename wasn't listed on the attachments list (#6494)
RELEASE 1.4-beta
----------------

@ -769,12 +769,12 @@ class rcube_message
// multipart/alternative or message/rfc822
if ($primary_type == 'multipart' || $part_mimetype == 'message/rfc822') {
$this->parse_structure($mail_part, true);
// list message/rfc822 as attachment as well (mostly .eml)
if ($primary_type == 'message' && !empty($mail_part->filename)) {
// list message/rfc822 as attachment as well
if ($part_mimetype == 'message/rfc822') {
$this->add_part($mail_part, 'attachment');
}
$this->parse_structure($mail_part, true);
}
// part text/[plain|html] or delivery status
else if ((($part_mimetype == 'text/plain' || $part_mimetype == 'text/html') && $mail_part->disposition != 'attachment') ||

Loading…
Cancel
Save