summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2019-06-21 10:54:34 +0200
committerBackportbot <backportbot-noreply@rullzer.com>2019-06-26 08:19:04 +0000
commitd0123a1b51ee698937fbd5c08412f324cdde5a1b (patch)
tree46daf04f3628dd17378c3efbe15610b4a4b5d3c8
parente339ed7f6e6fd36e9c29ef01ff78983aef9c1159 (diff)
downloadnextcloud-server-d0123a1b51ee698937fbd5c08412f324cdde5a1b.tar.gz
nextcloud-server-d0123a1b51ee698937fbd5c08412f324cdde5a1b.zip
Check if uploading to lookup server is enabled before verifying
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--settings/BackgroundJobs/VerifyUserData.php4
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;
}