Merge pull request #15021 from nextcloud/bugfix/noid/respect-lookup-server-disabling

nickvergessen · web-flow · commit 3325038c476a · 2019-04-10T08:49:08.000+02:00
[stable15] Respect the setting if the lookup server is disabled
diff --git a/apps/lookup_server_connector/lib/UpdateLookupServer.php b/apps/lookup_server_connector/lib/UpdateLookupServer.php
@@ -165,7 +165,7 @@ protected function sendToLookupServer(IUser $user, array $publicData) {
 	 * @return bool
 	 */
 	private function shouldUpdateLookupServer() {
-		return $this->lookupServerEnabled || !empty($this->lookupServer);
+		return $this->lookupServerEnabled && !empty($this->lookupServer);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ protected function sendToLookupServer(IUser $user, array $publicData) {`
`165`	`165`	`* @return bool`
`166`	`166`	`*/`
`167`	`167`	`private function shouldUpdateLookupServer() {`
`168`		`- return $this->lookupServerEnabled \|\| !empty($this->lookupServer);`
	`168`	`+ return $this->lookupServerEnabled && !empty($this->lookupServer);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`}`