diff options
| author | alecpl <alec@alec.pl> | 2010-11-29 09:54:15 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2010-11-29 09:54:15 +0000 |
| commit | fd371a519d64bbcf6d35288e532dc2179ff1e462 (patch) | |
| tree | b4e87e605d8e6bb13a54dcdd030332d45ebf8487 | |
| parent | 9016a84f7b6009eeeda26e0096434a47fae7f298 (diff) | |
- Fix attachments of type message/rfc822 are not listed on attachments list
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/rcube_message.php | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail =========================== - Plugin API: Add 'pass' argument in 'authenticate' hook (#1487134) +- Fix attachments of type message/rfc822 are not listed on attachments list RELEASE 0.5-BETA ---------------- diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php index 790f8d9bd..b6c865d1c 100644 --- a/program/include/rcube_message.php +++ b/program/include/rcube_message.php @@ -426,7 +426,7 @@ class rcube_message $mail_part->type = 'content'; $this->parts[] = $mail_part; } - + // list as attachment as well if (!empty($mail_part->filename)) $this->attachments[] = $mail_part; @@ -473,6 +473,10 @@ class rcube_message // attachment encapsulated within message/rfc822 part needs further decoding (#1486743) else if ($part_orig_mimetype == 'message/rfc822') { $this->parse_structure($mail_part, true); + + // list as attachment as well (mostly .eml) + if (!empty($mail_part->filename)) + $this->attachments[] = $mail_part; } // is a regular attachment (content-type name regexp according to RFC4288.4.2) else if (preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) { |