Fix inline forward an email from draft folder does not include attachments

This commit is contained in:
Hadi Nategh 2016-11-23 12:23:11 +01:00
parent 7b05b9fdc6
commit 28fb0cdc06

View File

@ -1751,7 +1751,7 @@ class mail_compose
if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) { if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) {
//error_log(__METHOD__.__LINE__.':'.array2string($attachments)); //error_log(__METHOD__.__LINE__.':'.array2string($attachments));
foreach($attachments as $attachment) { foreach($attachments as $attachment) {
if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType']))) if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])) || $attachment['disposition'] == 'attachment')
{ {
$this->addMessageAttachment($_uid, $attachment['partID'], $this->addMessageAttachment($_uid, $attachment['partID'],
$_folder, $_folder,