diff options
| author | alecpl <alec@alec.pl> | 2011-12-14 09:08:54 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-12-14 09:08:54 +0000 |
| commit | e2f30659a1bae74290df0e843bac5326cb05b79d (patch) | |
| tree | f7fac49c8409b8d8571584fec8656b71605404dc /program/steps/mail/func.inc | |
| parent | f41565354bd197a2c0b756bf698c66bf71e99e8c (diff) | |
- Backported r5598:r5599 from trunk
Diffstat (limited to 'program/steps/mail/func.inc')
| -rw-r--r-- | program/steps/mail/func.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index e51c2569b..503a56b00 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1046,6 +1046,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 |