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

* Calendar: Show correct event date when notified of a single cancelled recurring event

Browse Source
This commit is contained in:
nathangray 2020-12-08 12:30:49 -07:00
parent 93fb74503d
commit a3400010a7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -2103,6 +2103,14 @@ class calendar_uiforms extends calendar_ui
// convert event from servertime returned by calendar_ical to user-time // convert event from servertime returned by calendar_ical to user-time
$this->bo->server2usertime($event); $this->bo->server2usertime($event);
// Check if this is an exception
if($event['recur_type'] && count($event['recur_exception']) && !$event['recurrence'])
{
$diff = $event['recur_exception'][0] - $event['start'];
$event['start'] += $diff;
$event['end'] += $diff;
}
if (($existing_event = $this->bo->read($event['uid'], $event['recurrence'], false, 'ts', null, true)) && // true = read the exception if (($existing_event = $this->bo->read($event['uid'], $event['recurrence'], false, 'ts', null, true)) && // true = read the exception
!$existing_event['deleted']) !$existing_event['deleted'])
{ {