mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23087 from nextcloud/backport/23013/stable19 

[stable19] Show federation and email results also with exact user match unless c…
This commit is contained in:
Roeland Jago Douma 2020-10-01 09:01:25 +02:00 committed by GitHub
parent 12abb5d2d3 679aa21075
commit 830a4348f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/Collaboration/Collaborators/Search.php
View File

@ -90,9 +90,10 @@ class Search implements ISearch {
$searchResult->unsetResult($emailType); $searchResult->unsetResult($emailType);
} }
// if we have an exact local user match, there is no need to show the remote and email matches // if we have an exact local user match with an email-a-like query,
// there is no need to show the remote and email matches.
$userType = new SearchResultType('users'); $userType = new SearchResultType('users');
if ($searchResult->hasExactIdMatch($userType)) { if (strpos($search, '@') !== false && $searchResult->hasExactIdMatch($userType)) {
$searchResult->unsetResult($remoteType); $searchResult->unsetResult($remoteType);
$searchResult->unsetResult($emailType); $searchResult->unsetResult($emailType);
} }