Merge pull request #18880 from nextcloud/backport/18115/stable17

[stable17] Properly handle resources in ReminderService
nextcloud · Jan 20, 2020 · 46d89d6 · 46d89d6
2 parents 997548c + 5e1e80f
commit 46d89d6
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/apps/dav/lib/CalDAV/Reminder/ReminderService.php b/apps/dav/lib/CalDAV/Reminder/ReminderService.php
@@ -107,7 +107,11 @@ public function processReminders():void {
 		$reminders = $this->backend->getRemindersToProcess();
 
 		foreach($reminders as $reminder) {
-			$vcalendar = $this->parseCalendarData($reminder['calendardata']);
+			$calendarData = is_resource($reminder['calendardata'])
+				? stream_get_contents($reminder['calendardata'])
+				: $reminder['calendardata'];
+
+			$vcalendar = $this->parseCalendarData($calendarData);
 			if (!$vcalendar) {
 				$this->backend->removeReminder($reminder['id']);
 				continue;
@@ -176,8 +180,12 @@ public function onTouchCalendarObject(string $action,
 	 * @param array $objectData
 	 */
 	private function onCalendarObjectCreate(array $objectData):void {
+		$calendarData = is_resource($objectData['calendardata'])
+			? stream_get_contents($objectData['calendardata'])
+			: $objectData['calendardata'];
+
 		/** @var VObject\Component\VCalendar $vcalendar */
-		$vcalendar = $this->parseCalendarData($objectData['calendardata']);
+		$vcalendar = $this->parseCalendarData($calendarData);
 		if (!$vcalendar) {
 			return;
 		}