From 335b042b985da68b5934b10b843400398964168b Mon Sep 17 00:00:00 2001 From: thomascube Date: Thu, 27 Oct 2011 13:33:10 +0000 Subject: Fix inline display of image attachments --- program/include/rcube_message.php | 1 - program/steps/mail/func.inc | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php index e0c49f80c..0ecd86c4c 100644 --- a/program/include/rcube_message.php +++ b/program/include/rcube_message.php @@ -48,7 +48,6 @@ class rcube_message public $uid = null; public $headers; - public $structure; public $parts = array(); public $mime_parts = array(); public $attachments = array(); diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 7ea2f291e..69724c554 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1037,14 +1037,8 @@ function rcmail_message_body($attrib) rcmail_plain_body(Q($MESSAGE->body, 'strict', false)))); } - $ctype_primary = strtolower($MESSAGE->structure->ctype_primary); - $ctype_secondary = strtolower($MESSAGE->structure->ctype_secondary); - // list images after mail body - if ($CONFIG['inline_images'] - && $ctype_primary == 'multipart' - && !empty($MESSAGE->attachments)) - { + if ($CONFIG['inline_images'] && !empty($MESSAGE->attachments)) { foreach ($MESSAGE->attachments as $attach_prop) { // Content-Type: image/*... if (preg_match('/^image\//i', $attach_prop->mimetype) || -- cgit v1.2.3