From d4fb758a94b064b66163574a85075f7fc52e37c5 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 24 Jun 2020 13:36:11 -0600 Subject: [PATCH] * Calendar: Fix user / server timezone mismatch could put incorrect changes in event history --- calendar/inc/class.calendar_boupdate.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index f0e28e4960..7be30a1c76 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -1380,7 +1380,7 @@ class calendar_boupdate extends calendar_bo foreach($timestamps as $ts) { // we convert here from user-time to timestamps in server-time! - if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0; + if (isset($event[$ts])) $save_event[$ts] = $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0; } // convert tzid name to integer tz_id, of set user default if (empty($event['tzid']) || !($event['tz_id'] = calendar_timezones::tz2id($event['tzid'])))