From 1fef13b0c06c8399f23d01a880ecf3c58ad4e1fb Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 4 May 2012 17:34:13 +0200
Subject: [PATCH] Calendar: Use array_merge to join event arrays
---
apps/calendar/ajax/events.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
--
GitLab