diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-07 22:54:38 -0400 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-07 22:54:38 -0400 |
| commit | 9294a954383f06a16af921b0f390be0245f3bdb6 (patch) | |
| tree | ba7cd83716fd015c5ba31af06f13f2a4675433e8 /apps/calendar/lib/app.php | |
| parent | 960553f9c4fffe06fc6a9d80ed22fdcd2228a343 (diff) | |
| download | nextcloud-server-9294a954383f06a16af921b0f390be0245f3bdb6.tar.gz nextcloud-server-9294a954383f06a16af921b0f390be0245f3bdb6.zip | |
fix view of single shared events
Diffstat (limited to 'apps/calendar/lib/app.php')
| -rw-r--r-- | apps/calendar/lib/app.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php index 4ea73688505..9febf389f50 100644 --- a/apps/calendar/lib/app.php +++ b/apps/calendar/lib/app.php @@ -255,7 +255,7 @@ class OC_Calendar_App{ $singleevents = OC_Calendar_Share::allSharedwithuser(OC_USER::getUser(), OC_Calendar_Share::EVENT, 1, ($_GET['calendar_id'] == 'shared_rw')?'rw':'r'); foreach($singleevents as $singleevent){ $event = OC_Calendar_Object::find($singleevent['eventid']); - $events = array_merge($events, $event); + $events[] = $event; } }else{ $calendar_id = $_GET['calendar_id']; @@ -281,7 +281,7 @@ class OC_Calendar_App{ public static function generateEventOutput($event, $start, $end){ $output = array(); - if(array_key_exists('calendardata', $event)){ + if(isset($event['calendardata'])){ $object = OC_VObject::parse($event['calendardata']); $vevent = $object->VEVENT; }else{ @@ -332,7 +332,6 @@ class OC_Calendar_App{ $output['start'] = $result->format('Y-m-d H:i:s'); $output['end'] = date('Y-m-d H:i:s', $result->format('U') + $duration); } - $output[] = $output; } }else{ if($output['allDay'] == true){ @@ -343,7 +342,7 @@ class OC_Calendar_App{ $output['start'] = $start_dt->format('Y-m-d H:i:s'); $output['end'] = $end_dt->format('Y-m-d H:i:s'); } - $output[] = $output; } + return $output; } }
\ No newline at end of file |