From 18ca0b6efc75ff48817572cb784190b71f9ab296 Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 14 Dec 2011 09:05:58 +0000 Subject: [PATCH] - Skip inline images (fixes issue where images used in HTML body were displayed below the body once again) --- program/steps/mail/func.inc | 5 +++++ 1 file changed, 5 insertions(+) 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