diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-05 10:03:50 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-05 10:03:50 +0000 |
| commit | f265ed1c00dc96396416cdcc4f7d8a674ba860d3 (patch) | |
| tree | 8454b45d3094879f658e6448b612099f950cf223 | |
| parent | cdcab1e669c231b06b49e46791413e35ea7f743d (diff) | |
showImages attribute is skin template is obsolte: now set in user prefs
git-svn-id: https://svn.roundcube.net/trunk@1739 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 3 | ||||
| -rw-r--r-- | roundcubemail/skins/default/templates/message.html | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 70cd2c45e..e10843bd3 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -836,8 +836,7 @@ function rcmail_message_body($attrib) $ctype_secondary = strtolower($MESSAGE->structure->ctype_secondary); // list images after mail body - if (get_boolean($attrib['showimages']) - && $CONFIG['inline_images'] + if ($CONFIG['inline_images'] && $ctype_primary == 'multipart' && !empty($MESSAGE->attachments) && !strstr($message_body, '<html')) diff --git a/roundcubemail/skins/default/templates/message.html b/roundcubemail/skins/default/templates/message.html index 1aa92ab9e..dc8dab7da 100644 --- a/roundcubemail/skins/default/templates/message.html +++ b/roundcubemail/skins/default/templates/message.html @@ -41,7 +41,7 @@ <roundcube:object name="messageAttachments" id="attachment-list" /> <roundcube:object name="blockedObjects" id="remote-objects-message" /> -<roundcube:object name="messageBody" id="messagebody" showImages="true" /> +<roundcube:object name="messageBody" id="messagebody" /> </div> |