diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-12-14 09:05:58 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-12-14 09:05:58 +0000 |
| commit | 2d04b53054c6f872cd36a916d3b986adbd4005fd (patch) | |
| tree | 9cffc0fcbe21fb44fd5f371ab34eb77dbed76394 /roundcubemail/program | |
| parent | 363e9080c904643a839d157b229a82dba717eb69 (diff) | |
- Skip inline images (fixes issue where images used in HTML body were displayed below the body once again)
git-svn-id: https://svn.roundcube.net/trunk@5599 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index fd0bd453f..857ecd3f6 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/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 |