From ce990f65ae46430b0a75459dfb7b8f3e38d92170 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Wed, 10 May 2017 13:47:13 -0600
Subject: [PATCH] * Calendar - Fix bug where recurring events were moved to
 server time when adding a recurrence exception

---
 calendar/inc/class.calendar_bo.inc.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 77eaacc2f6..d84347ce11 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -890,11 +890,13 @@ class calendar_bo
 			}
 			if (!isset($event['start']) || !isset($event['end']))
 			{
-				$event['start'] = $event_read['start'];
-				$event['end'] = $event_read['end'];
+				$event['start'] = $this->date2usertime($event_read['start']);
+				$event['end'] = $this->date2usertime($event_read['end']);
 			}
 		}
 		if (!$start) $start = $event['start'];
+		$start_obj = new Api\DateTime($start);
+		$read_start = new Api\DateTime($event_read['start']);
 
 		$events = array();
 		$this->insert_all_recurrences($event,$start,$this->date2usertime($this->config['horizont']),$events);