Calendar: Use array_merge to join event arrays

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index b86620329e3e6d73e76cf6097b7f62a29f96a0c9..9ecb625246e9e1af452c9ccf3ac4bbc0499fb891 100755 (executable)
--- 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);