* Mail: Fix forwardinline breaks a mail with winmail.dat attachment

This commit is contained in:
Hadi Nategh 2017-02-02 11:26:57 +01:00
parent 56ab357f54
commit e2ceed61ac

View File

@ -1752,7 +1752,7 @@ class mail_compose
unset($this->sessionData['in-reply-to']); unset($this->sessionData['in-reply-to']);
unset($this->sessionData['to']); unset($this->sessionData['to']);
unset($this->sessionData['cc']); unset($this->sessionData['cc']);
if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) { if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID,null,true,false,false))) {
//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'])) || $attachment['disposition'] == 'attachment') if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])) || $attachment['disposition'] == 'attachment')