From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 31 Mar 2012 20:16:34 +0000 (-0400)
Subject: fix events.php for rewritten OC_Caledar_App class
X-Git-Tag: v4.0.0beta~244^2~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0fd8b1a04430fc36bd62a0828530dc2bc3910e81;p=nextcloud-server.git

fix events.php for rewritten OC_Caledar_App class
---

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 196b2c3394f..94c05f58088 100755
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
  */
 
 require_once ('../../../lib/base.php');
+//IS THERE A NATIVE SUPPORT IN SABREDAV ???
 require_once('when/When.php');
 
 OC_JSON::checkLoggedIn();
@@ -43,14 +44,7 @@ if($_GET['calendar_id'] == 'shared_rw' || $_GET['calendar_id'] == 'shared_r'){
 $user_timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
 $return = array();
 foreach($events as $event){
-	if (isset($event['calendardata'])) {
-		$object = OC_VObject::parse($event['calendardata']);
-		$vevent = $object->VEVENT;
-	} else {
-		$vevent = $event['vevent'];
-	}
-
-	$return_event = OC_Calendar_App::prepareForOutput($event, $vevent);
+	$return_event = OC_Calendar_App::prepareForOutput($event);
 
 	$dtstart = $vevent->DTSTART;
 	$start_dt = $dtstart->getDateTime();