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

[stable19] Show federation and email results also with exact user match unless c…
nextcloud · Oct 1, 2020 · 830a434 · 830a434
2 parents 12abb5d + 679aa21
commit 830a434
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/private/Collaboration/Collaborators/Search.php b/lib/private/Collaboration/Collaborators/Search.php
@@ -90,9 +90,10 @@ public function search($search, array $shareTypes, $lookup, $limit, $offset) {
 			$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');
-		if ($searchResult->hasExactIdMatch($userType)) {
+		if (strpos($search, '@') !== false && $searchResult->hasExactIdMatch($userType)) {
 			$searchResult->unsetResult($remoteType);
 			$searchResult->unsetResult($emailType);
 		}