summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2018-10-18 18:24:41 +0200
committerGitHub <noreply@github.com>2018-10-18 18:24:41 +0200
commit5daa4f27e1a4840a1a722729ca5ebafb6e749a43 (patch)
tree76bc3d469fe99c71492f09428bee4639e4e7bc5d /settings
parentfef361a0a088daa0109f62c1affba700b719d523 (diff)
parent8e4ae23c487b29bd8ea1a6d7d81e6996957e86fb (diff)
downloadnextcloud-server-5daa4f27e1a4840a1a722729ca5ebafb6e749a43.tar.gz
nextcloud-server-5daa4f27e1a4840a1a722729ca5ebafb6e749a43.zip
Merge pull request #11882 from nextcloud/feature/noid/consider-net-connection
Do not try to contact lookup server without internet connection or URL
Diffstat (limited to 'settings')
-rw-r--r--settings/BackgroundJobs/VerifyUserData.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/settings/BackgroundJobs/VerifyUserData.php b/settings/BackgroundJobs/VerifyUserData.php
index 8d54cde9dd9..b4a60ec8405 100644
--- a/settings/BackgroundJobs/VerifyUserData.php
+++ b/settings/BackgroundJobs/VerifyUserData.php
@@ -182,6 +182,9 @@ class VerifyUserData extends Job {
* @return bool true if we could check the verification code, otherwise false
*/
protected function verifyViaLookupServer(array $argument, $dataType) {
+ if(empty($this->lookupServerUrl) || $this->config->getSystemValue('has_internet_connection', true) === false) {
+ return false;
+ }
$user = $this->userManager->get($argument['uid']);