From 116f54a840bc386c72393a64bb233c75e2fdbd79 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 17 May 2018 12:50:26 +0000 Subject: [PATCH] Fix unwanted timezone change on event occurrence edit (Bifrost#T104637) --- plugins/calendar/drivers/kolab/kolab_driver.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php index ea58a4f1..b96d59f0 100644 --- a/plugins/calendar/drivers/kolab/kolab_driver.php +++ b/plugins/calendar/drivers/kolab/kolab_driver.php @@ -982,6 +982,15 @@ class kolab_driver extends calendar_driver // force 'current' mode for single occurrences stored as exception else if (!$old['recurrence'] && !$old['recurrence_id'] && $old['isexception']) $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