diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-12 23:56:25 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2018-01-15 11:15:38 +0100 |
| commit | 82869b6d814560283c0d0771437cbd6f98cd102f (patch) | |
| tree | 62f2463cbe35f3f1fb5c839b574cfcb61f56360b | |
| parent | 3dc7d0fb900eec8b792768505299ba73300efb89 (diff) | |
| download | nextcloud-server-82869b6d814560283c0d0771437cbd6f98cd102f.tar.gz nextcloud-server-82869b6d814560283c0d0771437cbd6f98cd102f.zip | |
Fix case when overwrite URL is empty during setup
Found while testing strict typing for PHP 7+.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| -rw-r--r-- | core/Command/Maintenance/UpdateHtaccess.php | 2 | ||||
| -rw-r--r-- | lib/private/Setup.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php index 4b9c8a72b52..001f07187d6 100644 --- a/core/Command/Maintenance/UpdateHtaccess.php +++ b/core/Command/Maintenance/UpdateHtaccess.php @@ -43,7 +43,7 @@ class UpdateHtaccess extends Command { $output->writeln('.htaccess has been updated'); return 0; } else { - $output->writeln('<error>Error updating .htaccess file, not enough permissions?</error>'); + $output->writeln('<error>Error updating .htaccess file, not enough permissions or "overwrite.cli.url" set to an invalid URL?</error>'); return 1; } } diff --git a/lib/private/Setup.php b/lib/private/Setup.php index 92246e8322e..43fa6c4a117 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -437,6 +437,9 @@ class Setup { return false; } $webRoot = parse_url($webRoot, PHP_URL_PATH); + if ($webRoot === null) { + return false; + } $webRoot = rtrim($webRoot, '/'); } else { $webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/'; |