diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-02 17:59:07 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-02 17:59:07 +0300 |
| commit | 0e95b9f2d560f5fc177e672162e995341cfba025 (patch) | |
| tree | dbe69345fb5ae4a0218f7c7b038daefd03f3e407 /settings | |
| parent | 8049b6e9984e1eeb2eeac388be8fc473b0b60cc0 (diff) | |
| parent | 59cfeae2cdb02377280efbedd8e7c1335932fdc4 (diff) | |
Merge pull request #22054 from vincchan/vincchan/fix#20199
Move data protection check to javascript
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/controller/checksetupcontroller.php | 1 | ||||
| -rw-r--r-- | settings/js/admin.js | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php index 7b995bf2c1b..26194bb1180 100644 --- a/settings/controller/checksetupcontroller.php +++ b/settings/controller/checksetupcontroller.php @@ -329,7 +329,6 @@ Raw output return new DataResponse( [ 'serverHasInternetConnection' => $this->isInternetConnectionWorking(), - 'dataDirectoryProtected' => $this->util->isHtaccessWorking($this->config), 'isMemcacheConfigured' => $this->isMemcacheConfigured(), 'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'), 'isUrandomAvailable' => $this->isUrandomAvailable(), diff --git a/settings/js/admin.js b/settings/js/admin.js index 6660bfe9b48..90b1de68370 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -171,9 +171,10 @@ $(document).ready(function(){ OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === 'true'), OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === 'true'), OC.SetupChecks.checkSetup(), - OC.SetupChecks.checkGeneric() - ).then(function(check1, check2, check3, check4, check5) { - var messages = [].concat(check1, check2, check3, check4, check5); + OC.SetupChecks.checkGeneric(), + OC.SetupChecks.checkDataProtected() + ).then(function(check1, check2, check3, check4, check5, check6) { + var messages = [].concat(check1, check2, check3, check4, check5, check6); var $el = $('#postsetupchecks'); $el.find('.loading').addClass('hidden'); |