diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-29 15:40:46 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-29 15:43:18 +0200 |
| commit | bda0026374381d4519f1032c365db0a18989fbb7 (patch) | |
| tree | 1f3202270cb0824f36363e47286ca0a758262436 /apps/calendar | |
| parent | b95996c02c8b94a69eba21e31e0c5a3d30756d6d (diff) | |
| download | nextcloud-server-bda0026374381d4519f1032c365db0a18989fbb7.tar.gz nextcloud-server-bda0026374381d4519f1032c365db0a18989fbb7.zip | |
fix birthday calendar
Diffstat (limited to 'apps/calendar')
| -rw-r--r-- | apps/calendar/lib/app.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php index 344c89f36b0..9cd6ad28518 100644 --- a/apps/calendar/lib/app.php +++ b/apps/calendar/lib/app.php @@ -368,12 +368,14 @@ class OC_Calendar_App{ * @return (array) $output - readable output */ public static function generateEventOutput($event, $start, $end){ - if(isset($event['calendardata'])){ - $object = OC_VObject::parse($event['calendardata']); - $vevent = $object->VEVENT; - }else{ - $vevent = $event['vevent']; + if(!isset($event['calendardata']) && !isset($event['vevent'])){ + return false; + } + if(!isset($event['calendardata']) && isset($event['vevent'])){ + $event['calendardata'] = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud's Internal iCal System\n" . $event['vevent']->serialize() . "END:VCALENDAR"; } + $object = OC_VObject::parse($event['calendardata']); + $vevent = $object->VEVENT; $return = array(); $id = $event['id']; $allday = ($vevent->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE)?true:false; @@ -404,15 +406,13 @@ class OC_Calendar_App{ $return[] = array_merge($staticoutput, $dynamicoutput); } }else{ - if(OC_Calendar_Object::isrepeating($id)){ - $object->expand($start, $end); - } + $object->expand($start, $end); foreach($object->getComponents() as $singleevent){ if(!($singleevent instanceof Sabre_VObject_Component_VEvent)){ continue; } $dynamicoutput = OC_Calendar_Object::generateStartEndDate($singleevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($singleevent), $allday, self::$tz); - $return[] = array_merge($staticoutput, $dynamicoutput); + $return[] = array_merge($staticoutput, $dynamicoutput); } } return $return; |