From: Georg Ehrke <georg.stefan.germany@googlemail.com>
Date: Fri, 21 Oct 2011 20:47:31 +0000 (+0200)
Subject: fix allday bug
X-Git-Tag: v3.0~85^2~15^2~25
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d50b014aba3296693f3be8829e605a29de207f0c;p=nextcloud-server.git

fix allday bug
---

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 8f466bee91a..c08c2e67586 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -25,23 +25,26 @@ foreach($events as $event)
 	$dtstart = $vevent->DTSTART;
 	$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
 	$start_dt = $dtstart->getDateTime();
-	$start_dt->setTimezone(new DateTimeZone($user_timezone));
 	$end_dt = $dtend->getDateTime();
-	$end_dt->setTimezone(new DateTimeZone($user_timezone));
-
-	$return_event = array();
-	$return_event['id'] = $event['id'];
-	$return_event['title'] = $event['summary'];
-	$return_event['description'] = isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'';
-	$return_event['start'] = $start_dt->format('Y-m-d H:i:s');
-	$return_event['end'] = $end_dt->format('Y-m-d H:i:s');
-	$return_event['allDay'] = false;
 	if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE)
 	{
 		$return_event['allDay'] = true;
+		$return_event['start'] = $start_dt->format('Y-m-d');
 		$end_dt->modify('-1 sec');
+		$return_event['end'] = $end_dt->format('Y-m-d');
+	}else{
+		$start_dt->setTimezone(new DateTimeZone($user_timezone));
+		$end_dt->setTimezone(new DateTimeZone($user_timezone));
+		$return_event['start'] = $start_dt->format('Y-m-d H:i:s');
 		$return_event['end'] = $end_dt->format('Y-m-d H:i:s');
+		$return_event['allDay'] = false;
 	}
+	$return_event = array();
+	$return_event['id'] = $event['id'];
+	$return_event['title'] = $event['summary'];
+	$return_event['description'] = isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'';
+	$return_event['start'] = $start_dt->format('Y-m-d H:i:s');
+	$return_event['end'] = $end_dt->format('Y-m-d H:i:s');
 	$return[] = $return_event;
 }
 OC_JSON::encodedPrint($return);