aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2019-04-10 08:48:44 +0200
committerGitHub <noreply@github.com>2019-04-10 08:48:44 +0200
commitd1e4d614daa52503b1a0bb5ebcaf6a7d2b33edb7 (patch)
tree22d13127e5088dcaa36c7ad353e4e385062c950f /apps
parent3a04650380f7dcc176ece94bd43170cf276b072a (diff)
parent541e15db1194be88895757511d017a27c0b47972 (diff)
downloadnextcloud-server-d1e4d614daa52503b1a0bb5ebcaf6a7d2b33edb7.tar.gz
nextcloud-server-d1e4d614daa52503b1a0bb5ebcaf6a7d2b33edb7.zip
Merge pull request #15022 from nextcloud/bugfix/noid/respect-lookup-server-disabling-master
Respect the setting if the lookup server is disabled
Diffstat (limited to 'apps')
-rw-r--r--apps/lookup_server_connector/lib/UpdateLookupServer.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/lookup_server_connector/lib/UpdateLookupServer.php b/apps/lookup_server_connector/lib/UpdateLookupServer.php
index f96b3d787f2..75da45dce2f 100644
--- a/apps/lookup_server_connector/lib/UpdateLookupServer.php
+++ b/apps/lookup_server_connector/lib/UpdateLookupServer.php
@@ -165,7 +165,7 @@ class UpdateLookupServer {
* @return bool
*/
private function shouldUpdateLookupServer() {
- return $this->lookupServerEnabled || !empty($this->lookupServer);
+ return $this->lookupServerEnabled && !empty($this->lookupServer);
}
}