From 5ac8ef6193471341479e7558197451536e0b85c2 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 29 Sep 2015 14:49:37 +0000
Subject: [PATCH] Fix end date changes when editing if the event spans daylight
 savings time change

---
 calendar/js/app.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index 386238ea4f..f721773058 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -790,7 +790,9 @@ app.classes.calendar = AppJS.extend(
 		if (typeof duration != 'undefined' && typeof end != 'undefined')
 		{
 			end.set_disabled(duration.get_value()!=='');
-			if (!end.disabled )
+
+			// Only set end date if not provided, adding seconds fails with DST
+			if (!end.disabled && !content.end)
 			{
 				end.set_value(start.get_value());
 				if (typeof content.duration != 'undefined') end.set_value("+"+content.duration);