Merge pull request #18115 from nextcloud/bugfix/17951/reminderservice_resource_error

Properly handle resources in ReminderService

1 files changed, 10 insertions, 2 deletions

diff --git a/apps/dav/lib/CalDAV/Reminder/ReminderService.php b/apps/dav/lib/CalDAV/Reminder/ReminderService.php
index 7796eef7db6..17c2d02a716 100644
--- a/apps/dav/lib/CalDAV/Reminder/ReminderService.php
+++ b/apps/dav/lib/CalDAV/Reminder/ReminderService.php
@@ -112,7 +112,11 @@ class ReminderService {
 		$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;
@@ -181,8 +185,12 @@ class ReminderService {
 	 * @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;
 		}