From 6497f4712ccb88e4437cd08d0aee316b47fe4dd1 Mon Sep 17 00:00:00 2001 From: Boris Budini Date: Wed, 2 Feb 2022 18:09:45 +0100 Subject: [PATCH 1/2] Fix #21370 --- apps/dav/lib/CalDAV/Reminder/Backend.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/dav/lib/CalDAV/Reminder/Backend.php b/apps/dav/lib/CalDAV/Reminder/Backend.php index 48b1e9aed4636..10f642e215e93 100644 --- a/apps/dav/lib/CalDAV/Reminder/Backend.php +++ b/apps/dav/lib/CalDAV/Reminder/Backend.php @@ -68,7 +68,8 @@ public function getRemindersToProcess():array { ->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')); + ->leftJoin('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id')) + ->groupBy(['cr.event_hash','cr.type','cr.uid']); $stmt = $query->execute(); return array_map( From b561f15542f3877e61c18461b3ec63afa6d22104 Mon Sep 17 00:00:00 2001 From: Boris Budini Date: Tue, 8 Mar 2022 13:28:22 +0100 Subject: [PATCH 2/2] Update Backend.php --- apps/dav/lib/CalDAV/Reminder/Backend.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dav/lib/CalDAV/Reminder/Backend.php b/apps/dav/lib/CalDAV/Reminder/Backend.php index 10f642e215e93..a7027f912827a 100644 --- a/apps/dav/lib/CalDAV/Reminder/Backend.php +++ b/apps/dav/lib/CalDAV/Reminder/Backend.php @@ -67,8 +67,8 @@ public function getRemindersToProcess():array { $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')) ->groupBy(['cr.event_hash','cr.type','cr.uid']); $stmt = $query->execute();