From: Clement Wong <git@clement.hk>
Date: Mon, 27 Apr 2020 00:28:47 +0000 (+0200)
Subject: Don't remove last user in ldap group when limit is -1
X-Git-Tag: v19.0.0beta6~21^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F20676%2Fhead;p=nextcloud-server.git

Don't remove last user in ldap group when limit is -1

Signed-off-by: Clement Wong <git@clement.hk>
---

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