diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-06-25 22:02:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 22:02:55 +0200 |
| commit | da025d4867cf8d54a1f2c7405dfb714093aa6989 (patch) | |
| tree | 934f270b9bcbdd8721456c499dfe6ac43ceb9afd | |
| parent | 2f5810f26ec9aaeece011953979def8cfd94f452 (diff) | |
| parent | 12c7ebe30f84d10172f73af5a3efcf3d524b10b0 (diff) | |
| download | nextcloud-server-da025d4867cf8d54a1f2c7405dfb714093aa6989.tar.gz nextcloud-server-da025d4867cf8d54a1f2c7405dfb714093aa6989.zip | |
Merge pull request #16027 from nextcloud/bugfix/noid/check-if-uploading-is-enabled-before-verifying
Check if uploading to lookup server is enabled before verifying
| -rw-r--r-- | settings/BackgroundJobs/VerifyUserData.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/settings/BackgroundJobs/VerifyUserData.php b/settings/BackgroundJobs/VerifyUserData.php index cf71cbd67bc..ed157581c57 100644 --- a/settings/BackgroundJobs/VerifyUserData.php +++ b/settings/BackgroundJobs/VerifyUserData.php @@ -186,7 +186,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) { + if(empty($this->lookupServerUrl) || + $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') !== 'yes' || + $this->config->getSystemValue('has_internet_connection', true) === false) { return false; } |