upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-14 01:21:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

Merge pull request #21104 from nextcloud/backport/20676/stable17

Browse source 
[stable17] Don't remove last user in ldap group when limit is -1
This commit is contained in:
Roeland Jago Douma 2020-05-27 21:58:49 +02:00 committed by GitHub
commit fbf7c93293
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/user_ldap/lib/Group_LDAP.php
View file

@ -828,6 +828,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)) {
@ -836,9 +839,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