summaryrefslogtreecommitdiffstats
path: root/apps/dav/lib/rootcollection.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-01-21 14:09:15 +0100
committerVincent Petry <pvince81@owncloud.com>2016-01-21 14:22:46 +0100
commit94a763a08450189d36791f9a8281e0c586927405 (patch)
tree058611449d8aa35eeb2271bc5e1abab175a7ab3a /apps/dav/lib/rootcollection.php
parent5639e41cb066eba2636dadd283365d6f5e9e70b3 (diff)
downloadnextcloud-server-94a763a08450189d36791f9a8281e0c586927405.tar.gz
nextcloud-server-94a763a08450189d36791f9a8281e0c586927405.zip
Inject user session to check for admin in system tags DAV handlers
Diffstat (limited to 'apps/dav/lib/rootcollection.php')
-rw-r--r--apps/dav/lib/rootcollection.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/apps/dav/lib/rootcollection.php b/apps/dav/lib/rootcollection.php
index 733341b1eaa..bfd1aefb053 100644
--- a/apps/dav/lib/rootcollection.php
+++ b/apps/dav/lib/rootcollection.php
@@ -58,15 +58,17 @@ class RootCollection extends SimpleCollection {
$caldavBackend = new CalDavBackend($db);
$calendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
$calendarRoot->disableListing = $disableListing;
- $isAdmin = \OC::$server->getGroupManager()->isAdmin(\OC::$server->getUserSession()->getUser()->getUID());
+
$systemTagCollection = new SystemTag\SystemTagsByIdCollection(
- $isAdmin,
- \OC::$server->getSystemTagManager()
+ \OC::$server->getSystemTagManager(),
+ \OC::$server->getUserSession(),
+ \OC::$server->getGroupManager()
);
$systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
- $isAdmin,
\OC::$server->getSystemTagManager(),
- \OC::$server->getSystemTagObjectMapper()
+ \OC::$server->getSystemTagObjectMapper(),
+ \OC::$server->getUserSession(),
+ \OC::$server->getGroupManager()
);
$usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend);