diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-07-25 15:44:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 15:44:13 +0200 |
| commit | 092a233f91ba07371f0b6b1f150dad11588ca5c8 (patch) | |
| tree | 4e102132921753b1d6586860838af91bb6dd1e5c | |
| parent | 469da4ff0aa78838f1043f78f20e2641dfa96c09 (diff) | |
| parent | 07cbabb5dbb21447b9071714cbb93a77fa5415df (diff) | |
| download | nextcloud-server-092a233f91ba07371f0b6b1f150dad11588ca5c8.tar.gz nextcloud-server-092a233f91ba07371f0b6b1f150dad11588ca5c8.zip | |
Merge pull request #16537 from nextcloud/backport/16503/stable15
[stable15] allow to provide supported calendar component set internally as a string
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 187ba4ecdcf..95bfcf20a7b 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -735,7 +735,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'); |