Skip to content

[stable18] Don't remove last user in ldap group when limit is -1 #20701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
Apr 28, 2020
Merged

[stable18] Don't remove last user in ldap group when limit is -1 #20701

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Don't remove last user in ldap group when limit is -1 
Signed-off-by: Clement Wong <[email protected]>
  • Loading branch information
@kklem0 @blizzz
kklem0 authored and blizzz committed Apr 28, 2020
commit 78571eb0c268a0215a66fa3f274813f4cda35665
6 changes: 3 additions & 3 deletions apps/user_ldap/lib/Group_LDAP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,9 @@ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
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)) {
Expand All @@ -837,9 +840,6 @@ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
return $groupUsers;
}

if($limit === -1) {
$limit = null;
}
$groupDN = $this->access->groupname2dn($gid);
if(!$groupDN) {
// group couldn't be found, return empty resultset
Expand Down