Merge pull request #16537 from nextcloud/backport/16503/stable15

rullzer · web-flow · commit 092a233f91ba · 2019-07-25T15:44:13.000+02:00
[stable15] allow to provide supported calendar component set internally as a string
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -735,7 +735,12 @@ function createCalendar($principalUri, $calendarUri, array $properties) {
 				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');

Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,12 @@ function createCalendar($principalUri, $calendarUri, array $properties) {`
`735`	`735`	`throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');`
`736`	`736`	`}`
`737`	`737`	`$values['components'] = implode(',',$properties[$sccs]->getValue());`
	`738`	`+ } else if (isset($properties['components'])) {`
	`739`	`+ // Allow to provide components internally without having`
	`740`	`+ // to create a SupportedCalendarComponentSet object`
	`741`	`+ $values['components'] = $properties['components'];`
`738`	`742`	`}`
	`743`	`+`
`739`	`744`	`$transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';`
`740`	`745`	`if (isset($properties[$transp])) {`
`741`	`746`	`$values['transparent'] = (int) ($properties[$transp]->getValue() === 'transparent');`