Skip to content

Commit c32b0bc

Browse files
authored
Merge pull request #65202 from nextcloud/backport/65201/stable26
[stable26] refactor(dav): replace sabre collection
2 parents 6b216c8 + f52b0ec commit c32b0bc

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

‎apps/dav/appinfo/v1/caldav.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
use OCA\DAV\CalDAV\Security\RateLimitingPlugin;
3232
use OCA\DAV\Connector\LegacyDAVACL;
3333
use OCA\DAV\CalDAV\CalendarRoot;
34+
use OCA\DAV\CalDAV\Principal\Collection as PrincipalCollection;
3435
use OCA\DAV\Connector\Sabre\Auth;
3536
use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
3637
use OCA\DAV\Connector\Sabre\MaintenancePlugin;
@@ -82,7 +83,7 @@
8283
$sendInvitations = \OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes';
8384

8485
// Root nodes
85-
$principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend);
86+
$principalCollection = new PrincipalCollection($principalBackend);
8687
$principalCollection->disableListing = !$debugging; // Disable listing
8788

8889
$addressBookRoot = new CalendarRoot($principalBackend, $calDavBackend, 'principals', $logger);

‎apps/dav/appinfo/v1/carddav.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
use OCA\DAV\CardDAV\AddressBookRoot;
3333
use OCA\DAV\CardDAV\CardDavBackend;
3434
use OCA\DAV\CardDAV\Security\CardDavRateLimitingPlugin;
35+
use OCA\DAV\CalDAV\Principal\Collection as PrincipalCollection;
3536
use OCA\DAV\Connector\LegacyDAVACL;
3637
use OCA\DAV\Connector\Sabre\Auth;
3738
use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
@@ -69,7 +70,7 @@
6970
$debugging = \OC::$server->getConfig()->getSystemValue('debug', false);
7071

7172
// Root nodes
72-
$principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend);
73+
$principalCollection = new PrincipalCollection($principalBackend);
7374
$principalCollection->disableListing = !$debugging; // Disable listing
7475

7576
$pluginManager = new PluginManager(\OC::$server, \OC::$server->query(IAppManager::class));

0 commit comments

Comments
 (0)