From 540f3d574d1f102aa3e08f7b84b12027d4437e52 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 11 Dec 2017 14:10:55 -0700 Subject: [PATCH] * Calendar - Fix alarms set in different timezone from server moved when saving event - now fixed default alarm too --- calendar/inc/class.calendar_boupdate.inc.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index f86a4dfe0b..708e29faff 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -1321,6 +1321,7 @@ 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 @@ -1347,10 +1348,6 @@ class calendar_boupdate extends calendar_bo } } } - foreach($event['alarm'] as $id => &$alarm) - { - $alarm['time'] = $this->date2ts($alarm['time'],true); // user to server-time - } } // you should always update modification time (ctag depends on it!)