diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-08-13 17:18:09 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-08-13 17:18:09 +0200 |
| commit | 1f96fb3352ad43155586d6deae95bf889768ba05 (patch) | |
| tree | b6686c7680f0013435390e4346ace9213a1ce425 | |
| parent | 4e53b5922d9b3727502a13eb0c36844e69f498e3 (diff) | |
| parent | 571e99b152913aa5833fa08588f001505994cfbf (diff) | |
| download | nextcloud-server-1f96fb3352ad43155586d6deae95bf889768ba05.tar.gz nextcloud-server-1f96fb3352ad43155586d6deae95bf889768ba05.zip | |
Merge pull request #18279 from owncloud/fix-ldap-proxy-everyonecount
also don't count group members when more than 1 ldap configs are active
| -rw-r--r-- | settings/users.php | 4 |
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; |