Changeset 5371 in subversion

Timestamp:

Oct 27, 2011 9:33:10 AM (19 months ago)

Author:

thomasb

Message:

Fix inline display of image attachments

Location:

trunk/roundcubemail/program

Files:

• include/rcube_message.php (modified) (1 diff)
• steps/mail/func.inc (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_message.php

@@ -49 +49 @@
     public $uid = null;
     public $headers;
-    public $structure;
     public $parts = array();
     public $mime_parts = array();

trunk/roundcubemail/program/steps/mail/func.inc

@@ -1038 +1038 @@
     }
 
-  $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/*...