diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-09-25 14:32:32 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-09-25 14:32:32 +0200 |
| commit | 9fc23e1967371d3765f24d74339704df77e29606 (patch) | |
| tree | 842624b0581fa98958cff530b65b06c05acb0cbe /core/setup | |
| parent | f46e49529fed8cb60ff846bb959b2f564b14bea6 (diff) | |
| parent | 6ff29f3874cac3c263c255b2c36cda5b8a1c67f1 (diff) | |
| download | nextcloud-server-9fc23e1967371d3765f24d74339704df77e29606.tar.gz nextcloud-server-9fc23e1967371d3765f24d74339704df77e29606.zip | |
Merge pull request #10934 from owncloud/datadir-write-setup
Don't complain about non-writable datadirs before we're installed
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 02226ad9e42..15679e33976 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()) { |