summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-09-17 10:48:15 +0200
committerAleksander Machniak <alec@alec.pl>2012-09-17 10:48:15 +0200
commitf7c11e862f002d0cd03f2eb4bae10ce3de69dfd2 (patch)
tree3463b5c04261bf47b465ba866466a0bd2f7b64b7 /program
parentfa57c98854972eb93bc7aebd8ef363d56989e0f3 (diff)
List related text/html part as attachment in plain text mode (#1488677)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_message.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 6af1d0133..fe2fcf354 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -494,8 +494,13 @@ class rcube_message
}
// list as attachment as well
- if (!empty($mail_part->filename))
+ 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') {