diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2020-04-28 12:58:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 12:58:02 +0200 |
| commit | 0c701cec565aba963573d4205295bd26c626798a (patch) | |
| tree | 25427c37f06180bc052e7def2903c49ef289425c /apps | |
| parent | c69686a29d47f0efb63b07cf369e54467ed7e369 (diff) | |
| parent | 9f5f505acfca368bea88cdcba551570cc0315567 (diff) | |
| download | nextcloud-server-0c701cec565aba963573d4205295bd26c626798a.tar.gz nextcloud-server-0c701cec565aba963573d4205295bd26c626798a.zip | |
Merge pull request #20676 from clementhk/ldap-group
Don't remove last user in ldap group when limit is -1
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/lib/Group_LDAP.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index f05c8fb8ca4..b7d1b0d62b8 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -842,6 +842,9 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface, IGroupLD return $groupUsers; } + if ($limit === -1) { + $limit = null; + } // check for cache of the query without limit and offset $groupUsers = $this->access->connection->getFromCache('usersInGroup-' . $gid . '-' . $search); if (!is_null($groupUsers)) { @@ -850,9 +853,6 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface, IGroupLD return $groupUsers; } - if ($limit === -1) { - $limit = null; - } $groupDN = $this->access->groupname2dn($gid); if (!$groupDN) { // group couldn't be found, return empty resultset |