diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-08-24 10:12:13 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-24 10:12:13 +0300 |
commit | 9aac6d9251880197755ee25d523549a0db892ba5 (patch) | |
tree | faad4eca48ba62a0513a80b174df931be45f77e5 /lib | |
parent | 14927afaf7964ed436620d99c868ca2adb92aa28 (diff) | |
parent | f8955b70925942808f4e7612fed793bfc0c60d36 (diff) |
Merge pull request #22355 from nextcloud/backport/20772/stable19
[stable19] Properly search for users when limittogroups is enabled
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Collaboration/Collaborators/UserPlugin.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php index 123fa731445..3566abf0a05 100644 --- a/lib/private/Collaboration/Collaborators/UserPlugin.php +++ b/lib/private/Collaboration/Collaborators/UserPlugin.php @@ -79,7 +79,15 @@ class UserPlugin implements ISearchPlugin { $usersInGroup = $this->groupManager->displayNamesInGroup($userGroupId, $search, $limit, $offset); foreach ($usersInGroup as $userId => $displayName) { $userId = (string) $userId; - $users[$userId] = $this->userManager->get($userId); + $user = $this->userManager->get($userId); + if (!$user->isEnabled()) { + // Ignore disabled users + continue; + } + $users[$userId] = $user; + } + if (count($usersInGroup) >= $limit) { + $hasMoreResults = true; } } } else { |