diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-15 11:25:29 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-15 11:25:29 +0200 |
| commit | 6f20d516466f50798c147ae228f39b4826a4b7db (patch) | |
| tree | 1bdcfa1622ffb5dc78684d90e6b92123b5ca15b8 /apps | |
| parent | b6a8de853062407fb4ae5890048410f9ba07d373 (diff) | |
| download | nextcloud-server-6f20d516466f50798c147ae228f39b4826a4b7db.tar.gz nextcloud-server-6f20d516466f50798c147ae228f39b4826a4b7db.zip | |
fix generateEventOutput for calendar hook
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/calendar/lib/app.php | 7 |
1 files changed, 2 insertions, 5 deletions
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; |