mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "adjust to nested group fix 

This reverts commit 845485cfe, which fixes #19816 regression.
This commit is contained in:
Frédéric Fortier 2015-10-15 20:30:27 -04:00 committed by Lukas Reschke
parent 7224e99ccd
commit f178f612d8
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/user_ldap/group_ldap.php
View File

@ -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();
}