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>
This commit is contained in:
parent
3dc7d0fb90
commit
82869b6d81
|
@ -43,7 +43,7 @@ class UpdateHtaccess extends Command {
|
||||||
$output->writeln('.htaccess has been updated');
|
$output->writeln('.htaccess has been updated');
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} 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;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -437,6 +437,9 @@ class Setup {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$webRoot = parse_url($webRoot, PHP_URL_PATH);
|
$webRoot = parse_url($webRoot, PHP_URL_PATH);
|
||||||
|
if ($webRoot === null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
$webRoot = rtrim($webRoot, '/');
|
$webRoot = rtrim($webRoot, '/');
|
||||||
} else {
|
} else {
|
||||||
$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
|
$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
|
||||||
|
|
Loading…
Reference in New Issue