aboutsummaryrefslogtreecommitdiffstats
path: root/apps/dav
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-07-25 13:36:01 +0200
committerGitHub <noreply@github.com>2019-07-25 13:36:01 +0200
commitc504ed66b7fd8133b634e596a7919f27baa1d7a2 (patch)
treec20e3cd38a3f289221d38576808975d1426a963a /apps/dav
parent569cf31cd6e4f6237d542ab683e035fa8cc1d219 (diff)
parentdce1787b9a54533c26a0e013e3ce339717256ac2 (diff)
downloadnextcloud-server-c504ed66b7fd8133b634e596a7919f27baa1d7a2.tar.gz
nextcloud-server-c504ed66b7fd8133b634e596a7919f27baa1d7a2.zip
Merge pull request #16503 from nextcloud/bugfix/5504/create_new_birthday_calendars_with_VEVENT_only
allow to provide supported calendar component set internally as a string
Diffstat (limited to 'apps/dav')
-rw-r--r--apps/dav/lib/CalDAV/CalDavBackend.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index 2d3dbd8dd12..91281dc0cb3 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -739,7 +739,12 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
}
$values['components'] = implode(',',$properties[$sccs]->getValue());
+ } else if (isset($properties['components'])) {
+ // Allow to provide components internally without having
+ // to create a SupportedCalendarComponentSet object
+ $values['components'] = $properties['components'];
}
+
$transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
if (isset($properties[$transp])) {
$values['transparent'] = (int) ($properties[$transp]->getValue() === 'transparent');