diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-11 16:28:44 +0100 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-11 16:28:44 +0100 |
commit | 373776b8d84bece3df4a06b157bbe41f51ef511d (patch) | |
tree | a57688402c8f01da0858774dde5d505ee627d2f4 | |
parent | 31435552566833f5c5c354f5a5b611d5a6208a68 (diff) | |
parent | 43dbe1cebf71a2b981dc439b7f17727512fcd63a (diff) | |
download | nextcloud-server-373776b8d84bece3df4a06b157bbe41f51ef511d.tar.gz nextcloud-server-373776b8d84bece3df4a06b157bbe41f51ef511d.zip |
Merge pull request #21622 from owncloud/revert-21479-fix-broken-state-in-htaccess-test
Revert "Remove unneeded check if htaccess test file already exists"
-rw-r--r-- | lib/private/util.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index ed62f1afb4a..4bcde68c355 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -1201,6 +1201,10 @@ class OC_Util { // creating a test file $testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName; + if (file_exists($testFile)) {// already running this test, possible recursive call + return false; + } + $fp = @fopen($testFile, 'w'); if (!$fp) { throw new OC\HintException('Can\'t create test file to check for working .htaccess file.', |