diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-09-12 15:51:33 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2016-09-13 10:51:48 +0200 |
| commit | 1675542df4a1cfb203dfcbe2393b559577043803 (patch) | |
| tree | 9744e7177478735dd7ff0ffa17e69f2a49df847a | |
| parent | 0543661064b00c27c2e9a1780acf34c8a364f6ce (diff) | |
| download | nextcloud-server-1675542df4a1cfb203dfcbe2393b559577043803.tar.gz nextcloud-server-1675542df4a1cfb203dfcbe2393b559577043803.zip | |
Display an error when updating .htaccess failed
| -rw-r--r-- | core/Command/Maintenance/UpdateHtaccess.php | 10 | ||||
| -rw-r--r-- | lib/private/Setup.php | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php index 21850786200..89eeb7ccf5b 100644 --- a/core/Command/Maintenance/UpdateHtaccess.php +++ b/core/Command/Maintenance/UpdateHtaccess.php @@ -38,8 +38,12 @@ class UpdateHtaccess extends Command { } protected function execute(InputInterface $input, OutputInterface $output) { - \OC\Setup::updateHtaccess(); - $output->writeln('.htaccess has been updated'); - return 0; + if (\OC\Setup::updateHtaccess()) { + $output->writeln('.htaccess has been updated'); + return 0; + } else { + $output->writeln('<error>Error updating .htaccess file, not enough permissions?</error>'); + return 1; + } } } diff --git a/lib/private/Setup.php b/lib/private/Setup.php index 3b3a57c3e96..2c7a2879088 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -472,9 +472,10 @@ class Setup { if ($content !== '') { //suppress errors in case we don't have permissions for it - @file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent.$content . "\n"); + return (bool) @file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent.$content . "\n"); } + return false; } public static function protectDataDirectory() { |