Properly search for users when limittogroups is enabled

Searching just for the uid is not enough.
This makes sure this done properly again now.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php
index 72368e505213d56dfb11ff09abb89c06e9765b37..0a603448525b40396c981ccc91008a01d147bf3c 100644 (file)
--- a/lib/private/Collaboration/Collaborators/UserPlugin.php
+++ b/lib/private/Collaboration/Collaborators/UserPlugin.php
@@ -95,7 +95,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 {