From 1675542df4a1cfb203dfcbe2393b559577043803 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 12 Sep 2016 15:51:33 +0200 Subject: Display an error when updating .htaccess failed --- core/Command/Maintenance/UpdateHtaccess.php | 10 +++++++--- 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 updating .htaccess file, not enough permissions?'); + 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() { -- cgit v1.2.3