From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 26 Jul 2012 16:40:12 +0000 (+0200)
Subject: apply fix suggested in oc-1132 - bugfix for oc-1132
X-Git-Tag: v4.0.6~17^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d8aca0c78e729e92a1e09c07b707d8718d81c29b;p=nextcloud-server.git

apply fix suggested in oc-1132 - bugfix for oc-1132
---

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index b575f5b9fde..06f85d32250 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -439,7 +439,7 @@ class OC_Calendar_App{
 					$output['end'] = date('Y-m-d', $result->format('U') + --$duration);
 				}else{
 					$output['start'] = $result->format('Y-m-d H:i:s');
-					$output['end'] = date('Y-m-d H:i:s', $result->format('U') + $duration);
+					$output['end'] = date('Y-m-d H:i:s', $result->format('U') + $result->format('Z') + $duration);
 				}
 				$return[] = $output;
 			}