sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Calendar: Use array_merge to join event arrays

remotes/origin/stable4
Bart Visscher 2012-05-04 17:34:13 +07:00
parent 01da64caf7
commit 1fef13b0c0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calendar/ajax/events.php
Unescape Escape View File

@ -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);