* Mail: meeting-request was not shown inside multipart/related

EGroupware · Feb 21, 2019 · 6ae2bd4 · 6ae2bd4
1 parent 5b5525b
commit 6ae2bd4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/api/src/Mail.php b/api/src/Mail.php
@@ -4772,11 +4772,13 @@ function getMultipartMixed($_uid, Horde_Mime_Part $_structure, $_htmlMode, $_pre
 	 * @param Horde_Mime_Part $_structure if given use structure for parsing
 	 * @param string $_htmlMode how to display a message, html, plain text, ...
 	 * @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
 	 * @return array containing the desired part
 	 */
-	function getMultipartRelated($_uid, Horde_Mime_Part $_structure, $_htmlMode, $_preserveSeen = false)
+	function getMultipartRelated($_uid, Horde_Mime_Part $_structure, $_htmlMode, $_preserveSeen=false, &$partCalendar=null)
 	{
-		return $this->getMultipartMixed($_uid, $_structure, $_htmlMode, $_preserveSeen);
+		$skip = array();
+		return $this->getMultipartMixed($_uid, $_structure, $_htmlMode, $_preserveSeen, $skip, $partCalendar);
 	}
 
 	/**
@@ -4970,7 +4972,7 @@ function getMessageBody($_uid, $_htmlOptions='', $_partID=null, Horde_Mime_Part
 						break;
 
 					case 'related':
-						$bodyParts = $this->getMultipartRelated($_uid, $_structure, $this->htmlOptions, $_preserveSeen);
+						$bodyParts = $this->getMultipartRelated($_uid, $_structure, $this->htmlOptions, $_preserveSeen, $calendar_part);
 						break;
 				}
 				return self::normalizeBodyParts($bodyParts);