diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-10-27 13:33:10 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-10-27 13:33:10 +0000 |
| commit | b5d1eb4a2d198332fb80afc95bd02a42061d96e5 (patch) | |
| tree | ae2a8937e07f918b69aa889a8bc25de032fd4915 | |
| parent | be88532be046854416246eecc84c30576d802b0d (diff) | |
Fix inline display of image attachments
git-svn-id: https://svn.roundcube.net/trunk@5371 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/include/rcube_message.php | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php index e0c49f80c..0ecd86c4c 100644 --- a/roundcubemail/program/include/rcube_message.php +++ b/roundcubemail/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/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 7ea2f291e..69724c554 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/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) || |