Calendar: Fix repeating events

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index b84f5b4c608498cbed16e53fd8c4dbb3f1c269cc..b86620329e3e6d73e76cf6097b7f62a29f96a0c9 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[] = OC_Calendar_App::generateEventOutput($event, $start, $end);
+       $output = $output + OC_Calendar_App::generateEventOutput($event, $start, $end);
 }
 OCP\JSON::encodedPrint($output);

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index e457aac2c787cd028bb8a29fde52f2b49856a16d..f955c59603da39ff070bfaafdc8a1c7bab401880 100755 (executable)
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -392,6 +392,7 @@ class OC_Calendar_App{
                        }
                }
 
+               $return = array();
                if($event['repeating'] == 1){
                        $duration = (double) $end_dt->format('U') - (double) $start_dt->format('U');
                        $r = new When();
@@ -422,6 +423,7 @@ class OC_Calendar_App{
                                        $output['start'] = $result->format('Y-m-d H:i:s');
                                        $output['end'] = date('Y-m-d H:i:s', $result->format('U') + $duration);
                                }
+                               $return[] = $output;
                        }
                }else{
                        if($output['allDay'] == true){
@@ -432,7 +434,8 @@ class OC_Calendar_App{
                                $output['start'] = $start_dt->format('Y-m-d H:i:s');
                                $output['end'] = $end_dt->format('Y-m-d H:i:s');
                        }
+                       $return[] = $output;
                }
-               return $output;
+               return $return;
        }
 }