extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-18 20:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not add inline attachment images again on draft

Browse Source
This commit is contained in:
Hadi Nategh 2015-06-11 17:43:17 +00:00
parent 96271f73f1
commit 5ba5b0fb45
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/inc/class.mail_compose.inc.php
View File

@ -1653,6 +1653,10 @@ class mail_compose
if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) { if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
foreach($attachments as $attachment) { foreach($attachments as $attachment) {
$cid = $attachment['cid'];
preg_match("/[cid:{$cid}]/", $bodyParts['0']['body'], $match);
if (!$match || !$attachment['cid'])
{
$this->addMessageAttachment($_uid, $attachment['partID'], $this->addMessageAttachment($_uid, $attachment['partID'],
$_folder, $_folder,
$attachment['name'], $attachment['name'],
@ -1660,6 +1664,7 @@ class mail_compose
$attachment['size']); $attachment['size']);
} }
} }
}
$mail_bo->closeConnection(); $mail_bo->closeConnection();
return $this->sessionData; return $this->sessionData;
} }