From 5e1e80fc40687f2c998400af41ff5257e3f7c7a0 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 26 Nov 2019 12:20:35 +0100 Subject: [PATCH] Properly handle resources in ReminderService Signed-off-by: Georg Ehrke --- apps/dav/lib/CalDAV/Reminder/ReminderService.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/dav/lib/CalDAV/Reminder/ReminderService.php b/apps/dav/lib/CalDAV/Reminder/ReminderService.php index dd19c400720e0..b163c2ad4b6a4 100644 --- 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; }