upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Merge pull request #7835 from nextcloud/fix-empty-overwrite-url-in-setup

Browse source 
Fix case when overwrite URL is empty during setup
This commit is contained in:
Morris Jobke 2018-01-15 17:55:23 +01:00 committed by GitHub
commit fc9f5fdfc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/Command/Maintenance/UpdateHtaccess.php
View file

@ -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;
}
}

3
lib/private/Setup.php
View file

@ -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 : '/';