diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-04-03 09:17:03 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-04-03 09:17:03 +0200 |
| commit | bd698341c4871bdabd763601583f0e9ff7137a97 (patch) | |
| tree | 93d4d0c61328df77f18fc33b2c27bffd80b947f0 | |
| parent | a389ffbb46d51d70fda99b1a3e043cd4f3f41ea1 (diff) | |
Remove "HTML message" from attachments list while viewing a message in text mode (#1486939)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_message.php | 12 |
2 files changed, 1 insertions, 12 deletions
@@ -7,6 +7,7 @@ CHANGELOG Roundcube Webmail - Call resize handler in intervals to prevent lags and double onresize calls in Chrome (#1489005) - Add rel="noreferrer" for links in displayed messages (#1484686) - Add ability to toggle between HTML and text while viewing a message (#1486939) +- Remove "HTML message" from attachments list while viewing a message in text mode (#1486939) - Support IMAP MOVE extension [RFC 6851] - Add attachment menu with Open and Download options (#1488975) - Display user-friendly message on IMAP "over quota" errors (#1484164) diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php index 42d7b9bbe..41a114f7f 100644 --- a/program/lib/Roundcube/rcube_message.php +++ b/program/lib/Roundcube/rcube_message.php @@ -486,14 +486,6 @@ class rcube_message $this->parts[] = $c; } - // add html part as attachment - if ($html_part !== null && $structure->parts[$html_part] !== $print_part) { - $html_part = $structure->parts[$html_part]; - $html_part->mimetype = 'text/html'; - - $this->attachments[] = $html_part; - } - // add unsupported/unrecognized parts to attachments list if ($attach_part) { $this->attachments[] = $structure->parts[$attach_part]; @@ -578,10 +570,6 @@ class rcube_message if (!empty($mail_part->filename)) { $this->attachments[] = $mail_part; } - // list html part as attachment (here the part is most likely inside a multipart/related part) - else if ($this->parse_alternative && ($secondary_type == 'html' && !$this->opt['prefer_html'])) { - $this->attachments[] = $mail_part; - } } // part message/* else if ($primary_type == 'message') { |