]> source.dussan.org Git - nextcloud-server.git/commitdiff
Don't remove last user in ldap group when limit is -1 20676/head
authorClement Wong <git@clement.hk>
Mon, 27 Apr 2020 00:28:47 +0000 (02:28 +0200)
committerClement Wong <git@clement.hk>
Mon, 27 Apr 2020 00:33:00 +0000 (02:33 +0200)
Signed-off-by: Clement Wong <git@clement.hk>
apps/user_ldap/lib/Group_LDAP.php

index f05c8fb8ca4df6734b6a03dad10faf1a421cf0d0..b7d1b0d62b8ebde958664f449b45a62ba360b1ec 100644 (file)
@@ -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