From 95a647be3e87c7b0d92f4e21e70957949abd9928 Mon Sep 17 00:00:00 2001 From: Clement Wong Date: Mon, 27 Apr 2020 02:28:47 +0200 Subject: [PATCH] Don't remove last user in ldap group when limit is -1 Signed-off-by: Clement Wong --- apps/user_ldap/lib/Group_LDAP.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index 6d9acd79d58..cc0bcae1608 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -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