diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-12 14:46:09 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-12 14:46:09 +0100 |
| commit | 2493cfede92c472c29cffc098206b8cdb7a2ca30 (patch) | |
| tree | 781eea83cdf925fd93384205c89e8a8be9d494eb /core/js/setupchecks.js | |
| parent | 4fc0fbe8d04b7b89ffe1c3b79621ebe12b2057be (diff) | |
| parent | 8b6b042ffde9490c24a1689919dbc6678381239c (diff) | |
| download | nextcloud-server-2493cfede92c472c29cffc098206b8cdb7a2ca30.tar.gz nextcloud-server-2493cfede92c472c29cffc098206b8cdb7a2ca30.zip | |
Merge pull request #21640 from owncloud/add-config-to-disable-wellknown-check
Add config switch to disable the .well-known URL check
Diffstat (limited to 'core/js/setupchecks.js')
| -rw-r--r-- | core/js/setupchecks.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 7940e7e30a6..2f0cc4c7b34 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -51,10 +51,16 @@ * * @param url the URL to test * @param placeholderUrl the placeholder URL - can be found at oc_defaults.docPlaceholderUrl + * @param {boolean} runCheck if this is set to false the check is skipped and no error is returned * @return $.Deferred object resolved with an array of error messages */ - checkWellKnownUrl: function(url, placeholderUrl) { + checkWellKnownUrl: function(url, placeholderUrl, runCheck) { var deferred = $.Deferred(); + + if(runCheck === false) { + deferred.resolve([]); + return deferred.promise(); + } var afterCall = function(xhr) { var messages = []; if (xhr.status !== 207) { |