summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-10-27 13:33:10 +0000
committerthomascube <thomas@roundcube.net>2011-10-27 13:33:10 +0000
commit335b042b985da68b5934b10b843400398964168b (patch)
tree207c2afd3a151ec383b2afb48304193f7c403ee7
parentb5a29fe22fccdd9b89914c4215655388995facd3 (diff)
Fix inline display of image attachments
-rw-r--r--program/include/rcube_message.php1
-rw-r--r--program/steps/mail/func.inc8
2 files changed, 1 insertions, 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) ||