summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-10-18 01:23:20 -0700
committerVincent Petry <pvince81@owncloud.com>2013-10-18 01:23:20 -0700
commit5c5621d84e577c361e64c0423679bf35ab393204 (patch)
tree9dd181b5b1786841052c43acf3319f8348fb2fdd /lib
parent11cfb9dc48383ad3cb3aa5c5871e0135cfef17b5 (diff)
parent6a60a47d595d29d9034f0bc1d565542cc76389d9 (diff)
downloadnextcloud-server-5c5621d84e577c361e64c0423679bf35ab393204.tar.gz
nextcloud-server-5c5621d84e577c361e64c0423679bf35ab393204.zip
Merge pull request #5395 from owncloud/more_check_options
add options to disable the check for a working .htaccess file in data
Diffstat (limited to 'lib')
-rwxr-xr-xlib/private/util.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/private/util.php b/lib/private/util.php
index 43f2c9bb635..885cce87541 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -754,6 +754,10 @@ class OC_Util {
* file in the data directory and trying to access via http
*/
public static function isHtAccessWorking() {
+ if (!\OC_Config::getValue("check_for_working_htaccess", true)) {
+ return true;
+ }
+
// testdata
$fileName = '/htaccesstest.txt';
$testContent = 'testcontent';
@@ -802,6 +806,9 @@ class OC_Util {
if (!function_exists('curl_init')) {
return true;
}
+ if (!\OC_Config::getValue("check_for_working_webdav", true)) {
+ return true;
+ }
$settings = array(
'baseUri' => OC_Helper::linkToRemote('webdav'),
);