summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2015-08-13 14:37:17 +0200
committerArthur Schiwon <blizzz@owncloud.com>2015-08-26 11:58:36 +0200
commit1d8b5ac909dea05f4d425f6091cfe7b7c3717ec2 (patch)
treef23ca7ab7cfa3ce98df4a93ca3365c5f22c915d2 /settings
parent540ad35f3bedeade34f6110eea9fce8dc96d6f84 (diff)
downloadnextcloud-server-1d8b5ac909dea05f4d425f6091cfe7b7c3717ec2.tar.gz
nextcloud-server-1d8b5ac909dea05f4d425f6091cfe7b7c3717ec2.zip
also don't count group members when more than 1 ldap configs are active
Diffstat (limited to 'settings')
-rw-r--r--settings/users.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/settings/users.php b/settings/users.php
index 3d7f39aa367..d4e51900ddd 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;