diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-05-04 17:34:13 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-05-04 17:34:13 +0200 |
| commit | 1fef13b0c06c8399f23d01a880ecf3c58ad4e1fb (patch) | |
| tree | 9628f64a2b9f49293bfd7eb06837f12ab61c8122 /apps/calendar/ajax/events.php | |
| parent | 01da64caf7bd8bcf2ef5653dd47c58017e87637d (diff) | |
| download | nextcloud-server-1fef13b0c06c8399f23d01a880ecf3c58ad4e1fb.tar.gz nextcloud-server-1fef13b0c06c8399f23d01a880ecf3c58ad4e1fb.zip | |
Calendar: Use array_merge to join event arrays
Diffstat (limited to 'apps/calendar/ajax/events.php')
| -rwxr-xr-x | apps/calendar/ajax/events.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php index b86620329e3..9ecb625246e 100755 --- a/apps/calendar/ajax/events.php +++ b/apps/calendar/ajax/events.php @@ -19,6 +19,6 @@ $events = OC_Calendar_App::getrequestedEvents($_GET['calendar_id'], $start, $end $output = array(); foreach($events as $event){ - $output = $output + OC_Calendar_App::generateEventOutput($event, $start, $end); + $output = array_merge($output, OC_Calendar_App::generateEventOutput($event, $start, $end)); } OCP\JSON::encodedPrint($output); |