[Pkg-owncloud-commits] [owncloud] 18/27: Revert "adjust to nested group fix

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.1.4RC2
in repository owncloud.

commit c5b28e079571cc0c6c63bba1226832ed46cd5159
Author: Frédéric Fortier <frederic.fortier at polymtl.ca>
Date:   Thu Oct 15 20:30:27 2015 -0400

    Revert "adjust to nested group fix
    
    This reverts commit 845485cfe, which fixes #19816 regression.
---
 apps/user_ldap/group_ldap.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 48200bf..351fa13 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -31,7 +31,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;
@@ -196,11 +195,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();
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git