From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 19 Mar 2012 07:33:36 +0000 (+0100)
Subject: Merge branch 'master' into sabredav_1.6
X-Git-Tag: v4.0.0beta~201^2~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=33b06c448443bb0085ff986c341594d80903f43b;p=nextcloud-server.git

Merge branch 'master' into sabredav_1.6
---

33b06c448443bb0085ff986c341594d80903f43b
diff --cc apps/calendar/ajax/events.php
index 6ea556a7abf,922df90b76b..dff02e15875
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@@ -44,10 -59,10 +59,10 @@@ foreach($events as $event)
  	$return_event = create_return_event($event, $vevent);
  
  	$dtstart = $vevent->DTSTART;
- 	$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
  	$start_dt = $dtstart->getDateTime();
+ 	$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
  	$end_dt = $dtend->getDateTime();
 -	if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
 +	if ($dtstart->getDateType() == Sabre_VObject_Property_DateTime::DATE){
  		$return_event['allDay'] = true;
  	}else{
  		$return_event['allDay'] = false;