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

Merge pull request #18279 from owncloud/fix-ldap-proxy-everyonecount 

also don't count group members when more than 1 ldap configs are active
This commit is contained in:
Morris Jobke 2015-08-13 17:18:09 +02:00
parent 4e53b5922d 571e99b152
commit 1f96fb3352
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings/users.php
View File

@ -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;