summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorFrédéric Fortier <frederic.fortier@polymtl.ca>2015-10-15 20:30:27 -0400
committerVincent Petry <pvince81@owncloud.com>2015-10-19 13:20:32 +0200
commit01bff3bc2446cd221280e968713e70cfd37ecf69 (patch)
tree4a57d71da267307ca1e9cf1966646c102107bc55 /apps
parent6bd1b032882341a043685d5f833991d235362247 (diff)
downloadnextcloud-server-01bff3bc2446cd221280e968713e70cfd37ecf69.tar.gz
nextcloud-server-01bff3bc2446cd221280e968713e70cfd37ecf69.zip
Revert "adjust to nested group fix
This reverts commit 845485cfe, which fixes #19816 regression.
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/group_ldap.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index cf58e5b902d..2e36a337b04 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -33,7 +33,6 @@ namespace OCA\user_ldap;
use OCA\user_ldap\lib\Access;
use OCA\user_ldap\lib\BackendUtility;
-use OCA\user_ldap\lib\user\User;
class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
protected $enabled = false;
@@ -198,11 +197,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
return array();
}
$seen[$DN] = 1;
- $user = $this->access->userManager->get($DN);
- if(!$user instanceof User) {
- return array();
- }
- $groups = $user->getMemberOfGroups();
+ $groups = $this->access->readAttribute($DN, 'memberOf');
if (!is_array($groups)) {
return array();
}