fix displaying of events

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 9cd6ad28518ce1df9f291ebe4e392cdecd9747c0..ca897a36dc02e9b914afe8117459c52593cc0081 100644 (file)
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -406,7 +406,9 @@ class OC_Calendar_App{
                                $return[] = array_merge($staticoutput, $dynamicoutput);
                        }
                }else{
-                       $object->expand($start, $end);
+                       if(OC_Calendar_Object::isrepeating($id) || $event['repeating'] == 1){
+                               $object->expand($start, $end);
+                       }
                        foreach($object->getComponents() as $singleevent){
                                if(!($singleevent instanceof Sabre_VObject_Component_VEvent)){
                                        continue;