aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-06-19 13:30:45 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-06-19 13:30:45 +0200
commit5ce0097b6f89dc0a14bb946b8ab457127f00edb1 (patch)
tree89826a99f99845d65d2f5529ae24d55b8effd032
parent2b2da6fe35fc0709f281d0d6e7864a21064f3ae9 (diff)
downloadnextcloud-server-5ce0097b6f89dc0a14bb946b8ab457127f00edb1.tar.gz
nextcloud-server-5ce0097b6f89dc0a14bb946b8ab457127f00edb1.zip
Calendar: only run ->expand if the event is repeating
-rw-r--r--apps/calendar/lib/app.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index c5fb501ce3e..167382a5e7d 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -398,7 +398,9 @@ class OC_Calendar_App{
$return[] = array_merge($staticoutput, $dynamicoutput);
}
}else{
- $object->expand($start, $end);
+ if(OC_Calendar_Object::isrepeating($id)){
+ $object->expand($start, $end);
+ }
foreach($object->getComponents() as $singleevent){
if(!($singleevent instanceof Sabre_VObject_Component_VEvent)){
continue;