fix generateEventOutput for calendar hook

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 4bd1e1b7119b5f0f4b3a671093cc98f62ce60a30..4adfa28dd198ba1d93d1d4b47e99336bc1c303a6 100644 (file)
--- 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;