From 6ae2bd4009f99f2daeb6f205e8b2328be1aafa87 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Thu, 21 Feb 2019 20:10:35 +0100
Subject: [PATCH] * Mail: meeting-request was not shown inside
 multipart/related

---
 api/src/Mail.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/api/src/Mail.php b/api/src/Mail.php
index 49f55cf94c..5d17311371 100644
--- a/api/src/Mail.php
+++ b/api/src/Mail.php
@@ -4772,11 +4772,13 @@ class Mail
 	 * @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 @@ class Mail
 						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);