diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-09-18 14:23:38 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-09-30 10:24:52 +0200 |
| commit | d102cb4ffacc8583c5b51297555c60e711e305bf (patch) | |
| tree | 67c3227157abff4b1d0d69b8c5ba38a626a2940f /core/setup | |
| parent | 83a06950f4e0175f2073bc23820d88eb63dad642 (diff) | |
| download | nextcloud-server-d102cb4ffacc8583c5b51297555c60e711e305bf.tar.gz nextcloud-server-d102cb4ffacc8583c5b51297555c60e711e305bf.zip | |
Don't test for htaccess if we cant write into the datadir anyway
Diffstat (limited to 'core/setup')
| -rw-r--r-- | core/setup/controller.php | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/core/setup/controller.php b/core/setup/controller.php index c046bd5eaa6..fca16ea27be 100644 --- a/core/setup/controller.php +++ b/core/setup/controller.php @@ -116,16 +116,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()) { |