From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 15 Jun 2012 09:25:29 +0000 (+0200)
Subject: fix generateEventOutput for calendar hook
X-Git-Tag: v4.5.0beta1~74^2~407^2~24
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6f20d516466f50798c147ae228f39b4826a4b7db;p=nextcloud-server.git

fix generateEventOutput for calendar hook
---

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 4bd1e1b7119..4adfa28dd19 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -362,17 +362,14 @@ class OC_Calendar_App{
 	 * @return (array) $output - readable output
 	 */
 	public static function generateEventOutput($event, $start, $end){
-		// Why is the following code necessary ? //
-		/*if(isset($event['calendardata'])){
+		if(isset($event['calendardata'])){
 			$object = OC_VObject::parse($event['calendardata']);
 			$vevent = $object->VEVENT;
 		}else{
 			$vevent = $event['vevent'];
-		}*/
+		}
 		$return = array();
 		$id = $event['id'];
-		$object = $object = OC_VObject::parse($event['calendardata']);
-		$vevent = $object->VEVENT;
 		$allday = ($vevent->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE)?true:false;
 		$last_modified = @$vevent->__get('LAST-MODIFIED');
 		$lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;