Fix unwanted timezone change on event occurrence edit (Bifrost#T104637)
This commit is contained in:
parent
0d7b85e155
commit
116f54a840
1 changed files with 9 additions and 0 deletions
|
@ -982,6 +982,15 @@ class kolab_driver extends calendar_driver
|
||||||
// force 'current' mode for single occurrences stored as exception
|
// force 'current' mode for single occurrences stored as exception
|
||||||
else if (!$old['recurrence'] && !$old['recurrence_id'] && $old['isexception'])
|
else if (!$old['recurrence'] && !$old['recurrence_id'] && $old['isexception'])
|
||||||
$savemode = 'current';
|
$savemode = 'current';
|
||||||
|
|
||||||
|
// Stick to the master timezone for all occurrences (Bifrost#T104637)
|
||||||
|
$master_tz = $master['start']->getTimezone();
|
||||||
|
$event_tz = $event['start']->getTimezone();
|
||||||
|
|
||||||
|
if ($master_tz->getName() != $event_tz->getName()) {
|
||||||
|
$event['start']->setTimezone($master_tz);
|
||||||
|
$event['end']->setTimezone($master_tz);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if update affects scheduling and update attendee status accordingly
|
// check if update affects scheduling and update attendee status accordingly
|
||||||
|
|
Loading…
Add table
Reference in a new issue