From cdf1cf82baef9764b3211017e7c3e63fb10676d3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 7 Feb 2012 22:49:23 +0100
Subject: [PATCH] merge 64a617b2a1016108c946cc533875a40030bbd317 into master

---
 apps/calendar/ajax/events.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 apps/calendar/ajax/events.php

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
old mode 100644
new mode 100755
index 75fac6838d7..dd593ddec99
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -39,13 +39,13 @@ foreach($events as $event){
 	$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
 	$return_event = array();
 	$start_dt = $dtstart->getDateTime();
-	$start_dt->setTimezone(new DateTimeZone($user_timezone));
 	$end_dt = $dtend->getDateTime();
-	$end_dt->setTimezone(new DateTimeZone($user_timezone));
 	if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
 		$return_event['allDay'] = true;
 	}else{
 		$return_event['allDay'] = false;
+		$start_dt->setTimezone(new DateTimeZone($user_timezone));
+		$end_dt->setTimezone(new DateTimeZone($user_timezone));
 	}
 	//Repeating Events
 	if($event['repeating'] == 1){