From 33110fc2cdb292400cd22fb36f7be8602654ec3f Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Wed, 6 Dec 2017 13:47:54 -0700
Subject: [PATCH] * Calendar - Fix alarms set in different timezone from server
 moved when saving event

---
 calendar/inc/class.calendar_boupdate.inc.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index 72edd1ae33..f86a4dfe0b 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1347,6 +1347,10 @@ 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!)
@@ -1616,7 +1620,7 @@ class calendar_boupdate extends calendar_bo
 			);
 			// Reset cached event
 			static::$cached_event = array();
-			
+
 			if (isset($status2msg[$status]) && !$skip_notification)
 			{
 				if (!is_array($event)) $event = $this->read($cal_id);