From cc8c38e8ba55c5a64587951d2ef87ab1e652835d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 25 Nov 2015 17:15:40 +0100
Subject: [PATCH] Fix principal collection for CavDAVTester
---
apps/dav/lib/rootcollection.php | 4 ++--
apps/dav/tests/travis/caldavtest/config/serverinfo.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/dav/lib/rootcollection.php b/apps/dav/lib/rootcollection.php
index c0a37a1de9d..3e349fa31c9 100644
--- a/apps/dav/lib/rootcollection.php
+++ b/apps/dav/lib/rootcollection.php
@@ -28,12 +28,12 @@ class RootCollection extends SimpleCollection {
$filesCollection = new Files\RootCollection($principalBackend, 'principals/users');
$filesCollection->disableListing = $disableListing;
$caldavBackend = new CalDavBackend($db);
- $calendarRoot = new CalendarRoot($principalBackend, $caldavBackend);
+ $calendarRoot = new CalendarRoot($principalBackend, $caldavBackend, 'principals/users');
$calendarRoot->disableListing = $disableListing;
$cardDavBackend = new CardDavBackend(\OC::$server->getDatabaseConnection(), $principalBackend);
- $addressBookRoot = new AddressBookRoot($principalBackend, $cardDavBackend);
+ $addressBookRoot = new AddressBookRoot($principalBackend, $cardDavBackend, 'principals/users');
$addressBookRoot->disableListing = $disableListing;
$children = [
diff --git a/apps/dav/tests/travis/caldavtest/config/serverinfo.xml b/apps/dav/tests/travis/caldavtest/config/serverinfo.xml
index 24d63d4a3ae..a474bb7135c 100644
--- a/apps/dav/tests/travis/caldavtest/config/serverinfo.xml
+++ b/apps/dav/tests/travis/caldavtest/config/serverinfo.xml
@@ -180,7 +180,7 @@
<!-- relative path to main principal collection-->
<substitution>
<key>$principalcollection:</key>
- <value>$root:principals/</value>
+ <value>$root:principals/users/</value>
</substitution>
<!-- the core recored type collections-->
--
GitLab