extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

* ActiveSync: Fix error body part not set, while trying to forward an email

Browse Source
This commit is contained in:
Hadi Nategh 2017-04-26 17:23:48 +02:00
parent a63df98b05
commit a206ec325a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Mailer.php
View File

@ -816,7 +816,7 @@ class Mailer extends Horde_Mime_Mail
if (!($part_id = $base->findBody($subtype))) return null; if (!($part_id = $base->findBody($subtype))) return null;
return $base->getPart($part_id); return $base->getPart($part_id);
} }
catch (Exception $e) { catch (Horde_Mail_Exception $e) {
unset($e); unset($e);
return $subtype == 'html' ? $this->_htmlBody : $this->_body; return $subtype == 'html' ? $this->_htmlBody : $this->_body;
} }

3
mail/inc/class.mail_zpush.inc.php
View File

@ -704,8 +704,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
} }
// get all the attachments and add them too. // get all the attachments and add them too.
// start handle Attachments // start handle Attachments
// $_uid, $_partID=null, Horde_Mime_Part $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=false, $resolveTNEF=true, $_folderName='' $attachments = $this->mail->getMessageAttachments($uid,null,null,true,false,true,$folder);
$attachments = $this->mail->getMessageAttachments($uid, null, null, true, false, true , $folder);
$attachmentNames = false; $attachmentNames = false;
if (is_array($attachments) && count($attachments)>0) if (is_array($attachments) && count($attachments)>0)
{ {