mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11324 from owncloud/tryToCreateDatadirectory 

Try to create datadirectory to test whether the .htaccess works
This commit is contained in:
Lukas Reschke 2014-09-29 12:22:20 +02:00
parent 63726ea9e2 c20d629836
commit a8ed427515
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/setup/controller.php
View File

@ -116,9 +116,14 @@ class Controller {
$errors = array(); $errors = array();
if (is_dir($datadir) and is_writable($datadir)) { // Create data directory to test whether the .htaccess works
// Notice that this is not necessarily the same data directory as the one
// that will effectively be used.
@mkdir($datadir);
if (is_dir($datadir) && is_writable($datadir)) {
// Protect data directory here, so we can test if the protection is working // Protect data directory here, so we can test if the protection is working
\OC_Setup::protectDataDirectory(); \OC_Setup::protectDataDirectory();
try { try {
$htaccessWorking = \OC_Util::isHtaccessWorking(); $htaccessWorking = \OC_Util::isHtaccessWorking();
} catch (\OC\HintException $e) { } catch (\OC\HintException $e) {