diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-15 17:55:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 17:55:23 +0100 |
| commit | fc9f5fdfc403561e4e5372ce432f3624357dbd52 (patch) | |
| tree | 87ae6d868c2af1c9c8098e325ee66cd3ff220179 /lib/private | |
| parent | 9ddfccc52f6d7085bb590d7eb68e7025995a7547 (diff) | |
| parent | 82869b6d814560283c0d0771437cbd6f98cd102f (diff) | |
| download | nextcloud-server-fc9f5fdfc403561e4e5372ce432f3624357dbd52.tar.gz nextcloud-server-fc9f5fdfc403561e4e5372ce432f3624357dbd52.zip | |
Merge pull request #7835 from nextcloud/fix-empty-overwrite-url-in-setup
Fix case when overwrite URL is empty during setup
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Setup.php | 3 |
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 : '/'; |