From 0ef894ec2949100aee8624701edbf38087ea9047 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 15 Mar 2013 09:09:06 +0100 Subject: [PATCH] Fix has_*_part() methods so they return same result no matter what prefer_html option value is --- program/lib/Roundcube/rcube_message.php | 8 ++++---- 1 file 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; }