summaryrefslogtreecommitdiffstats
path: root/apps/calendar
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-06-29 18:13:52 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-06-29 18:13:52 +0200
commit652a874fa6ad82d1bc797898bce23c0ad52be14c (patch)
treed9b28aa1728afd18ad4f8372a0dab2e8de7d017c /apps/calendar
parent3bcf176a53c17f43c252673b2e3eced9d9ce94f3 (diff)
downloadnextcloud-server-652a874fa6ad82d1bc797898bce23c0ad52be14c.tar.gz
nextcloud-server-652a874fa6ad82d1bc797898bce23c0ad52be14c.zip
fix displaying of events
Diffstat (limited to 'apps/calendar')
-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 9cd6ad28518..ca897a36dc0 100644
--- 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;