From be5f03b24842a15aca5635bf17fc202d6cadd99d Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 05 Sep 2008 06:03:50 -0400
Subject: [PATCH] showImages attribute is skin template is obsolte: now set in user prefs
---
program/steps/mail/func.inc | 3 +--
skins/default/templates/message.html | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 70cd2c4..e10843b 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -836,8 +836,7 @@
$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/skins/default/templates/message.html b/skins/default/templates/message.html
index 1aa92ab..dc8dab7 100644
--- a/skins/default/templates/message.html
+++ b/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>
--
Gitblit v1.9.1