Merge pull request #23013 from nextcloud/bugfix/noid/show-federation-results-with-the-same-name

rullzer · web-flow · commit 7d776091bd0a · 2020-09-29T09:13:08.000+02:00
Show federation and email results also with exact user match unless c…
diff --git a/lib/private/Collaboration/Collaborators/Search.php b/lib/private/Collaboration/Collaborators/Search.php
@@ -91,9 +91,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);
 		}

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,10 @@ public function search($search, array $shareTypes, $lookup, $limit, $offset) {`
`91`	`91`	`$searchResult->unsetResult($emailType);`
`92`	`92`	`}`
`93`	`93`
`94`		`- // if we have an exact local user match, there is no need to show the remote and email matches`
	`94`	`+ // if we have an exact local user match with an email-a-like query,`
	`95`	`+ // there is no need to show the remote and email matches.`
`95`	`96`	`$userType = new SearchResultType('users');`
`96`		`- if ($searchResult->hasExactIdMatch($userType)) {`
	`97`	`+ if (strpos($search, '@') !== false && $searchResult->hasExactIdMatch($userType)) {`
`97`	`98`	`$searchResult->unsetResult($remoteType);`
`98`	`99`	`$searchResult->unsetResult($emailType);`
`99`	`100`	`}`