summaryrefslogtreecommitdiffstats
path: root/settings/ajax
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-12-08 10:37:06 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-12-08 10:37:06 +0100
commite6908f8b890414451dfc32af4d76562016d75d0f (patch)
tree194a12a95f3a0f9043208ba4e74163293c6795d7 /settings/ajax
parent2784d580bd62f87b54c5679ceabcb641a9cda9c0 (diff)
parent2b762271808598f69927a3d279ad24402a34f54e (diff)
downloadnextcloud-server-e6908f8b890414451dfc32af4d76562016d75d0f.tar.gz
nextcloud-server-e6908f8b890414451dfc32af4d76562016d75d0f.zip
Merge pull request #12657 from owncloud/ajaxify-htaccess-check
Check for working .htaccess via AJAX
Diffstat (limited to 'settings/ajax')
-rw-r--r--settings/ajax/checksetup.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/settings/ajax/checksetup.php b/settings/ajax/checksetup.php
index 6bf5bc5642e..64718933317 100644
--- a/settings/ajax/checksetup.php
+++ b/settings/ajax/checksetup.php
@@ -17,7 +17,8 @@ if (OC_Util::isInternetConnectionEnabled()) {
}
OCP\JSON::success(
- array(
- 'serverhasinternetconnection' => $hasInternet
+ array (
+ 'serverHasInternetConnection' => $hasInternet,
+ 'dataDirectoryProtected' => OC_Util::isHtaccessWorking()
)
);