[Pkg-owncloud-commits] [owncloud] 68/79: also don't count group members when more than 1 ldap configs are active

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 1d8b5ac909dea05f4d425f6091cfe7b7c3717ec2
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Thu Aug 13 14:37:17 2015 +0200

    also don't count group members when more than 1 ldap configs are active
---
 settings/users.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/settings/users.php b/settings/users.php
index 3d7f39a..d4e5190 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -42,7 +42,9 @@ $groupManager = \OC_Group::getManager();
 $sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT;
 
 if (class_exists('\OCA\user_ldap\GROUP_LDAP')) {
-	$isLDAPUsed = $groupManager->isBackendUsed('\OCA\user_ldap\GROUP_LDAP');
+	$isLDAPUsed =
+		   $groupManager->isBackendUsed('\OCA\user_ldap\GROUP_LDAP')
+		|| $groupManager->isBackendUsed('\OCA\user_ldap\Group_Proxy');
 	if ($isLDAPUsed) {
 		// LDAP user count can be slow, so we sort by group name here
 		$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;

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