From d0d70314176682d098cc17e39b9e479e83e879b1 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 27 Jan 2021 11:04:08 -0700 Subject: [PATCH] * Calendar: Fix alarm for all users had wrong timezone when user timezone was not server timezone --- calendar/inc/class.calendar_boupdate.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index f8b79dd27e..4eaca20a5f 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -1475,6 +1475,8 @@ class calendar_boupdate extends calendar_bo $this->enum_groups($expanded); foreach($event['alarm'] as $id => &$alarm) { + $alarm['time'] = $this->date2ts($alarm['time'],true); // user to server-time + // remove alarms belonging to not longer existing or rejected participants if ($alarm['owner'] && isset($expanded['participants'])) { @@ -1489,7 +1491,6 @@ class calendar_boupdate extends calendar_bo //error_log(__LINE__.': '.__METHOD__."(".array2string($event).") deleting alarm=".array2string($alarm).", $status=".array2string($alarm)); } } - $alarm['time'] = $this->date2ts($alarm['time'],true); // user to server-time } } // update all existing alarm times, in case alarm got moved and alarms are not include in $event