Browse Source

Properly handle resources in ReminderService

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
tags/v18.0.0RC1
Georg Ehrke 4 years ago
parent
commit
05e47af6b2
No account linked to committer's email address
1 changed files with 10 additions and 2 deletions
  1. 10
    2
      apps/dav/lib/CalDAV/Reminder/ReminderService.php

+ 10
- 2
apps/dav/lib/CalDAV/Reminder/ReminderService.php View File

@@ -108,7 +108,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;
@@ -177,8 +181,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;
}

Loading…
Cancel
Save