summaryrefslogtreecommitdiff
path: root/program/steps/mail
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 /program/steps/mail
parentb5a29fe22fccdd9b89914c4215655388995facd3 (diff)
Fix inline display of image attachments
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/func.inc8
1 files changed, 1 insertions, 7 deletions
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) ||