From 2251f9fce7ad40013d34703015c6daf6989042af Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sat, 14 Jun 2008 18:09:53 +0000
Subject: - Added option to disable displaying of attached images below the
 message body

git-svn-id: https://svn.roundcube.net/trunk@1536 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/steps/mail/func.inc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program/steps/mail')

diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc
index af3f6e72f..a27023f27 100644
--- a/roundcubemail/program/steps/mail/func.inc
+++ b/roundcubemail/program/steps/mail/func.inc
@@ -745,10 +745,14 @@ function rcmail_message_body($attrib)
 
   $ctype_primary = strtolower($MESSAGE->structure->ctype_primary);
   $ctype_secondary = strtolower($MESSAGE->structure->ctype_secondary);
-  
+
   // list images after mail body
-  if (get_boolean($attrib['showimages']) && $ctype_primary == 'multipart' &&
-      !empty($MESSAGE->attachments) && !strstr($message_body, '<html')) {
+  if (get_boolean($attrib['showimages']) 
+	&& $CONFIG['inline_images']
+	&& $ctype_primary == 'multipart'
+        && !empty($MESSAGE->attachments) 
+	&& !strstr($message_body, '<html'))
+    {
     foreach ($MESSAGE->attachments as $attach_prop) {
       if (strpos($attach_prop->mimetype, 'image/') === 0) {
         $out .= html::tag('hr') . html::p(array('align' => "center"),
-- 
cgit v1.2.3