Merge pull request #14325 from nextcloud/fix/always_query_lookup_server_in_gs_mode

rullzer · web-flow · commit 0a576459a9af · 2019-02-25T10:23:40.000+01:00
Always query lookup server in GS mode
diff --git a/lib/private/Collaboration/Collaborators/LookupPlugin.php b/lib/private/Collaboration/Collaborators/LookupPlugin.php
@@ -66,7 +66,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 		$hasInternetConnection = (bool)$this->config->getSystemValue('has_internet_connection', true);
 
 		// if case of Global Scale we always search the lookup server
-		if ((!$isLookupServerEnabled && !$isGlobalScaleEnabled) || !$hasInternetConnection) {
+		if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled || !$hasInternetConnection)) {
 			return false;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {`
`66`	`66`	`$hasInternetConnection = (bool)$this->config->getSystemValue('has_internet_connection', true);`
`67`	`67`
`68`	`68`	`// if case of Global Scale we always search the lookup server`
`69`		`- if ((!$isLookupServerEnabled && !$isGlobalScaleEnabled) \|\| !$hasInternetConnection) {`
	`69`	`+ if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled \|\| !$hasInternetConnection)) {`
`70`	`70`	`return false;`
`71`	`71`	`}`
`72`	`72`