summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-12-14 09:05:58 +0000
committeralecpl <alec@alec.pl>2011-12-14 09:05:58 +0000
commit18ca0b6efc75ff48817572cb784190b71f9ab296 (patch)
tree842dd405882113123f818e4bcc7f47b56952bc16
parent82f4820fae85ede4f961c3ea71292ee7322128f6 (diff)
- Skip inline images (fixes issue where images used in HTML body were displayed below the body once again)
-rw-r--r--program/steps/mail/func.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index fd0bd453f..857ecd3f6 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1070,6 +1070,11 @@ function rcmail_message_body($attrib)
// list images after mail body
if ($CONFIG['inline_images'] && !empty($MESSAGE->attachments)) {
foreach ($MESSAGE->attachments as $attach_prop) {
+ // skip inline images
+ if ($attach_prop->content_id && $attach_prop->disposition == 'inline') {
+ continue;
+ }
+
// Content-Type: image/*...
if (preg_match('/^image\//i', $attach_prop->mimetype) ||
// ...or known file extension: many clients are using application/octet-stream