From 108e25b4b34f0aade264bc9bf1f6216197cd56fe Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 31 Mar 2017 17:38:02 +0200 Subject: [PATCH] * Calendar/CalDAV: fix server did not send alarms for virtual exceptions of recurring events --- calendar/inc/class.calendar_groupdav.inc.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index fd89a361d7..60e97022c6 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -758,14 +758,10 @@ class calendar_groupdav extends Api\CalDAV\Handler } continue; // nothing to change } - // alarms are reported on recurrences --> move them to master - if ($master) + // add alarms from master to recurrences, as clients otherwise have no alarms on virtual exceptions + if ($master && $master['alarm']) { - foreach($recurrence['alarm'] as $alarm) - { - $master['alarm'][] = $alarm; - } - $recurrence['alarm'] = array(); + $recurrence['alarm'] = $master['alarm']; } // now we need to check if this recurrence is an exception if (!$expand && $master && $master['participants'] == $recurrence['participants'])