From 0ef894ec2949100aee8624701edbf38087ea9047 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 15 Mar 2013 04:09:06 -0400
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 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index 1e3d143..b833346 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -208,8 +208,8 @@
// 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 @@
// 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;
}
--
Gitblit v1.9.1