diff options
| author | Daniel Kesselberg <mail@danielkesselberg.de> | 2018-09-28 22:32:19 +0200 |
|---|---|---|
| committer | Daniel Kesselberg <mail@danielkesselberg.de> | 2018-09-28 22:32:19 +0200 |
| commit | c275beecebb96a914616e39ec61a22e4597358ec (patch) | |
| tree | c6c850aa4a5d2a72bc48ea35a57eec9d0abce5ac /lib/private/Setup.php | |
| parent | b7bd6bd68250612d975b63fcfbb0865224c93d7c (diff) | |
| download | nextcloud-server-c275beecebb96a914616e39ec61a22e4597358ec.tar.gz nextcloud-server-c275beecebb96a914616e39ec61a22e4597358ec.zip | |
Allow url without / for overwrite.cli.url
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'lib/private/Setup.php')
| -rw-r--r-- | lib/private/Setup.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/Setup.php b/lib/private/Setup.php index d5ccde6bba3..9f5403b8318 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -445,11 +445,10 @@ class Setup { if ($webRoot === '') { throw new InvalidArgumentException('overwrite.cli.url is empty'); } - $webRoot = parse_url($webRoot, PHP_URL_PATH); - if ($webRoot === null) { + if (!filter_var($webRoot, FILTER_VALIDATE_URL)) { throw new InvalidArgumentException('invalid value for overwrite.cli.url'); } - $webRoot = rtrim($webRoot, '/'); + $webRoot = rtrim(parse_url($webRoot, PHP_URL_PATH), '/'); } else { $webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/'; } |