summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-03-15 09:09:06 +0100
committerAleksander Machniak <alec@alec.pl>2013-03-15 09:09:06 +0100
commit0ef894ec2949100aee8624701edbf38087ea9047 (patch)
tree0b42efd1e314387b2958e26342a56e81407d7323
parent574928200fd8da1194af9a9a1e741c77d7a50185 (diff)
Fix has_*_part() methods so they return same result no matter what
prefer_html option value is
-rw-r--r--program/lib/Roundcube/rcube_message.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index 1e3d143eb..b83334613 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -208,8 +208,8 @@ class rcube_message
// check all message parts
foreach ($this->mime_parts as $part) {
if ($part->mimetype == 'text/html' || ($enriched && $part->mimetype == 'text/enriched')) {
- // Skip if part is an attachment
- if ($this->is_attachment($part)) {
+ // Skip if part is an attachment, don't use is_attachment() here
+ if ($part->filename) {
continue;
}
@@ -248,8 +248,8 @@ class rcube_message
// check all message parts
foreach ($this->mime_parts as $part) {
if ($part->mimetype == 'text/plain') {
- // Skip if part is an attachment
- if ($this->is_attachment($part)) {
+ // Skip if part is an attachment, don't use is_attachment() here
+ if ($part->filename) {
continue;
}