extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-23 14:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert exidently merged "If a single attachment fails, continue with the others instead of failing altogether"

Browse Source 
This reverts commit 92b7694bae.
This commit is contained in:
Ralf Becker 2018-12-04 09:38:42 +01:00
parent 7e029d7abd
commit d3f5559616
1 changed files with 79 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Mail.php
View File

@ -6759,8 +6759,6 @@ class Mail
$basedir = $data = '';
$needTempFile = true;
try
{
// do not change urls for absolute images (thanks to corvuscorax)
if (substr($url, 0, 5) !== 'data:')
{
@ -6851,13 +6849,6 @@ class Mail
$_html2parse = str_replace($images[0][$i], $images[1][$i].'="'.$cid.'"', $_html2parse);
}
}
}
catch(\Exception $e)
{
// Something went wrong with this attachment. Skip it.
error_log("Error adding inline attachment. " . $e->getMessage());
error_log($e->getTraceAsString());
}
$attachments [] = array(
'name' => $filename,
'type' => $mimeType,