From 52d0d949104e6b43d8daa39dad64b20cc003440c Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 14 Nov 2012 13:58:15 +0100 Subject: Fix handling of text/enriched content on message reply/forward/edit --- program/include/rcube_message.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'program/include') diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php index 9b8484c15..74bf4574f 100644 --- a/program/include/rcube_message.php +++ b/program/include/rcube_message.php @@ -198,14 +198,15 @@ class rcube_message * Determine if the message contains a HTML part * * @param bool $recursive Enables checking in all levels of the structure + * @param bool $enriched Enables checking for text/enriched parts too * * @return bool True if a HTML is available, False if not */ - function has_html_part($recursive = true) + function has_html_part($recursive = true, $enriched = false) { // check all message parts foreach ($this->parts as $part) { - if ($part->mimetype == 'text/html') { + if ($part->mimetype == 'text/html' || ($enriched && $part->mimetype == 'text/enriched')) { // Level check, we'll skip e.g. HTML attachments if (!$recursive) { $level = explode('.', $part->mime_id); -- cgit v1.2.3