Don't test for htaccess if we cant write into the datadir anyway

remotes/origin/fix-10825
Robin Appelman 11 years ago
parent c8dbdc29d0
commit 6ff29f3874
  1. 22
      core/setup/controller.php

@ -119,16 +119,18 @@ class Controller {
$errors = array();
// Protect data directory here, so we can test if the protection is working
\OC_Setup::protectDataDirectory();
try {
$htaccessWorking = \OC_Util::isHtaccessWorking();
} catch (\OC\HintException $e) {
$errors[] = array(
'error' => $e->getMessage(),
'hint' => $e->getHint()
);
$htaccessWorking = false;
if (is_dir($datadir) and is_writable($datadir)) {
// Protect data directory here, so we can test if the protection is working
\OC_Setup::protectDataDirectory();
try {
$htaccessWorking = \OC_Util::isHtaccessWorking();
} catch (\OC\HintException $e) {
$errors[] = array(
'error' => $e->getMessage(),
'hint' => $e->getHint()
);
$htaccessWorking = false;
}
}
if (\OC_Util::runningOnMac()) {

Loading…
Cancel
Save