diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-06-14 18:09:53 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-06-14 18:09:53 +0000 |
| commit | 2251f9fce7ad40013d34703015c6daf6989042af (patch) | |
| tree | 29eaa1b85a57bae752b75e466db02c0c0b64a238 /roundcubemail/program/steps/mail | |
| parent | 0990783e9e22c691f9f7131260170265bcbe0cc4 (diff) | |
- 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
Diffstat (limited to 'roundcubemail/program/steps/mail')
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 10 |
1 files changed, 7 insertions, 3 deletions
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"), |