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

rullzer · web-flow · commit 830a4348f9c2 · 2020-10-01T09:01:25.000+02:00
[stable19] 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
@@ -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);
 		}

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