Skip to content
Snippets Groups Projects
Commit 3eef5c84 authored by Jared Hancock's avatar Jared Hancock
Browse files

thread: Detect inline and separate attachments

If an email contains both inline and separate attachments, the previous
logic would detect all the attachments as inline.

Separate attachments have the `cid` set to `false`. This will pass the
`isset` test, which would cause the logic to search through the body for a
string of `cid:`, which would very likely be found if there was another
inline image somewhere in the body of the email.
parent 1b111a58
Branches
Tags
No related merge requests found
......@@ -1055,7 +1055,8 @@ Class ThreadEntry {
//Emailed or API attachments
if (isset($vars['attachments']) && $vars['attachments']) {
foreach ($vars['attachments'] as &$a)
if (isset($a['cid']) && strpos($body, 'cid:'.$a['cid']) !== false)
if (isset($a['cid']) && $a['cid']
&& strpos($body, 'cid:'.$a['cid']) !== false)
$a['inline'] = true;
unset($a);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment