rysiek
/
owncalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't array_merge the generated event output if the generation failed

master
nezzi 2013-11-26 18:15:04 +01:00
parent 6005448d67
commit 938e56f402
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ajax/events.php
View File

@ -30,6 +30,9 @@ $end = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat(
$events = OC_Calendar_App::getrequestedEvents($calendar_id, $start, $end);
$output = array();
foreach($events as $event) {
$output = array_merge($output, OC_Calendar_App::generateEventOutput($event, $start, $end));
$result = OC_Calendar_App::generateEventOutput($event, $start, $end);
if (is_array($result)) {
$output = array_merge($output, $result);
}
}
OCP\JSON::encodedPrint($output);