extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 03:13:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: fix mails consists of both multipart/mixed and multipart/related create duplicated content

Browse Source
This commit is contained in:
Hadi Nategh 2019-10-16 17:01:02 +02:00
parent 012d7a5a20
commit b13a3a4619
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/Mail.php
View File

@ -4703,7 +4703,7 @@ class Mail
break; break;
case 'related': case 'related':
$bodyPart = array_merge($bodyPart, $this->getMultipartRelated($_uid, $part, $_htmlMode, $_preserveSeen)); $bodyPart = array_merge($bodyPart, $this->getMultipartRelated($_uid, $part, $_htmlMode, $_preserveSeen, $partCalendar, $skipParts));
break; break;
} }
break; break;
@ -4779,12 +4779,12 @@ class Mail
* @param string $_htmlMode how to display a message, html, plain text, ... * @param string $_htmlMode how to display a message, html, plain text, ...
* @param boolean $_preserveSeen flag to preserve the seenflag by using body.peek * @param boolean $_preserveSeen flag to preserve the seenflag by using body.peek
* @param Horde_Mime_Part& $partCalendar =null on return text/calendar part, if one was contained or false * @param Horde_Mime_Part& $partCalendar =null on return text/calendar part, if one was contained or false
* @param array& $skipParts - passed by reference to have control/knowledge which parts are already fetched
* @return array containing the desired part * @return array containing the desired part
*/ */
function getMultipartRelated($_uid, Horde_Mime_Part $_structure, $_htmlMode, $_preserveSeen=false, &$partCalendar=null) function getMultipartRelated($_uid, Horde_Mime_Part $_structure, $_htmlMode, $_preserveSeen=false, &$partCalendar=null, &$skipParts=array())
{ {
$skip = array(); return $this->getMultipartMixed($_uid, $_structure, $_htmlMode, $_preserveSeen, $skipParts, $partCalendar);
return $this->getMultipartMixed($_uid, $_structure, $_htmlMode, $_preserveSeen, $skip, $partCalendar);
} }
/** /**