diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-03-30 17:04:09 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-03-30 17:04:09 +0200 |
| commit | bf17ac929d16b36a131ba9cec7abed304bb78abb (patch) | |
| tree | ea46e51a6980b3856ec1d30688210b56d6293992 | |
| parent | 308a43a10e655008e4dc55446cae58f0eecc4e62 (diff) | |
| parent | 4163a5efadd5984010d455c7cbd848bd17d5450d (diff) | |
| download | nextcloud-server-bf17ac929d16b36a131ba9cec7abed304bb78abb.tar.gz nextcloud-server-bf17ac929d16b36a131ba9cec7abed304bb78abb.zip | |
Merge pull request #15169 from rullzer/fix_displayNamesInGroup
Groupmanagers displayNamesInGroup should actually search in displaynames
| -rw-r--r-- | core/ajax/share.php | 2 | ||||
| -rw-r--r-- | lib/private/group/manager.php | 2 | ||||
| -rw-r--r-- | tests/lib/group/manager.php | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php index 7bc01133a6d..05756fc1c8b 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -262,7 +262,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo while ($count < 15 && count($users) == $limit) { $limit = 15 - $count; if ($shareWithinGroupOnly) { - $users = OC_Group::DisplayNamesInGroups($usergroups, (string)$_GET['search'], $limit, $offset); + $users = OC_Group::displayNamesInGroups($usergroups, (string)$_GET['search'], $limit, $offset); } else { $users = OC_User::getDisplayNames((string)$_GET['search'], $limit, $offset); } diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index 876068f4755..774a76a3063 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -267,7 +267,7 @@ class Manager extends PublicEmitter implements IGroupManager { } do { - $filteredUsers = $this->userManager->search($search, $searchLimit, $searchOffset); + $filteredUsers = $this->userManager->searchDisplayName($search, $searchLimit, $searchOffset); foreach($filteredUsers as $filteredUser) { if($group->inGroup($filteredUser)) { $groupUsers[]= $filteredUser; diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php index e3462caf806..76996a2b9bb 100644 --- a/tests/lib/group/manager.php +++ b/tests/lib/group/manager.php @@ -448,7 +448,7 @@ class Manager extends \Test\TestCase { $userBackend = $this->getMock('\OC_User_Backend'); $userManager->expects($this->any()) - ->method('search') + ->method('searchDisplayName') ->with('user3') ->will($this->returnCallback(function($search, $limit, $offset) use ($userBackend) { switch($offset) { @@ -513,7 +513,7 @@ class Manager extends \Test\TestCase { $userBackend = $this->getMock('\OC_User_Backend'); $userManager->expects($this->any()) - ->method('search') + ->method('searchDisplayName') ->with('user3') ->will($this->returnCallback(function($search, $limit, $offset) use ($userBackend) { switch($offset) { @@ -580,7 +580,7 @@ class Manager extends \Test\TestCase { $userBackend = $this->getMock('\OC_User_Backend'); $userManager->expects($this->any()) - ->method('search') + ->method('searchDisplayName') ->with('user3') ->will($this->returnCallback(function($search, $limit, $offset) use ($userBackend) { switch($offset) { |