Skip to content
Browse files

Remove "HTML message" from attachments list while viewing a message i…

…n text mode (#1486939)
  • Loading branch information...
1 parent a389ffb commit bd698341c4871bdabd763601583f0e9ff7137a97 @alecpl alecpl committed
Showing with 1 addition and 12 deletions.
  1. +1 −0 CHANGELOG
  2. +0 −12 program/lib/Roundcube/rcube_message.php
View
1 CHANGELOG
@@ -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)
View
12 program/lib/Roundcube/rcube_message.php
@@ -486,14 +486,6 @@ private function parse_structure($structure, $recursive = false)
$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 @@ private function parse_structure($structure, $recursive = false)
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') {

0 comments on commit bd69834

Please sign in to comment.
Something went wrong with that request. Please try again.