aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Setup.php
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-01-12 23:56:25 +0100
committerMorris Jobke <hey@morrisjobke.de>2018-01-15 11:15:38 +0100
commit82869b6d814560283c0d0771437cbd6f98cd102f (patch)
tree62f2463cbe35f3f1fb5c839b574cfcb61f56360b /lib/private/Setup.php
parent3dc7d0fb900eec8b792768505299ba73300efb89 (diff)
downloadnextcloud-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>
Diffstat (limited to 'lib/private/Setup.php')
-rw-r--r--lib/private/Setup.php3
1 files changed, 3 insertions, 0 deletions
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 : '/';