holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar/CalDAV: fix server did not send alarms for virtual exceptions of recurring events

Browse Source
This commit is contained in:
Ralf Becker 2017-03-31 17:38:02 +02:00
parent a3154e8de2
commit 108e25b4b3
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -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'])