diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2020-05-01 11:37:50 +0200 |
|---|---|---|
| committer | Thomas Citharel <tcit@tcit.fr> | 2022-02-15 10:15:46 +0100 |
| commit | 6f9afa77b34e2242583e71c8d31a84e499cbf092 (patch) | |
| tree | 101d323df19d3dd17f5b946df860352acbee7ba5 /apps/dav | |
| parent | acba237ec56a8987e246d1046bd8f5b763db1336 (diff) | |
| download | nextcloud-server-6f9afa77b34e2242583e71c8d31a84e499cbf092.tar.gz nextcloud-server-6f9afa77b34e2242583e71c8d31a84e499cbf092.zip | |
Consider only reminders with calendar data
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/CalDAV/Reminder/Backend.php | 4 | ||||
| -rw-r--r-- | apps/dav/lib/CalDAV/Reminder/ReminderService.php | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/apps/dav/lib/CalDAV/Reminder/Backend.php b/apps/dav/lib/CalDAV/Reminder/Backend.php index 48b1e9aed46..b0476e9594c 100644 --- a/apps/dav/lib/CalDAV/Reminder/Backend.php +++ b/apps/dav/lib/CalDAV/Reminder/Backend.php @@ -67,8 +67,8 @@ class Backend { $query->select(['cr.*', 'co.calendardata', 'c.displayname', 'c.principaluri']) ->from('calendar_reminders', 'cr') ->where($query->expr()->lte('cr.notification_date', $query->createNamedParameter($this->timeFactory->getTime()))) - ->leftJoin('cr', 'calendarobjects', 'co', $query->expr()->eq('cr.object_id', 'co.id')) - ->leftJoin('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id')); + ->join('cr', 'calendarobjects', 'co', $query->expr()->eq('cr.object_id', 'co.id')) + ->join('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id')); $stmt = $query->execute(); return array_map( diff --git a/apps/dav/lib/CalDAV/Reminder/ReminderService.php b/apps/dav/lib/CalDAV/Reminder/ReminderService.php index ad5c18d477d..109fc95e9be 100644 --- a/apps/dav/lib/CalDAV/Reminder/ReminderService.php +++ b/apps/dav/lib/CalDAV/Reminder/ReminderService.php @@ -119,6 +119,10 @@ class ReminderService { ? stream_get_contents($reminder['calendardata']) : $reminder['calendardata']; + if (!$calendarData) { + continue; + } + $vcalendar = $this->parseCalendarData($calendarData); if (!$vcalendar) { $this->backend->removeReminder($reminder['id']); @@ -168,6 +172,10 @@ class ReminderService { ? stream_get_contents($objectData['calendardata']) : $objectData['calendardata']; + if (!$calendarData) { + return; + } + /** @var VObject\Component\VCalendar $vcalendar */ $vcalendar = $this->parseCalendarData($calendarData); if (!$vcalendar) { |