Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'apps/calendar')
-rwxr-xr-xapps/calendar/ajax/events.php2
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);