From 9f5f505acfca368bea88cdcba551570cc0315567 Mon Sep 17 00:00:00 2001 From: Clement Wong Date: Mon, 27 Apr 2020 02:28:47 +0200 Subject: 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(-) (limited to 'apps/user_ldap') 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 -- cgit v1.2.3