diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2014-02-20 14:57:03 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2014-02-20 14:57:03 +0100 |
| commit | 4eadc3609410f992cf3e7e70c9fe33a2d3bfd9e6 (patch) | |
| tree | 6ad79bdeea07440a3f265ecb945ac97480928650 | |
| parent | e4c3ef2ca68bb474547184e66d529b3926b395a6 (diff) | |
| parent | 2ff0d3a2552ea18e6e73a9de9332f89f723a1495 (diff) | |
| download | nextcloud-server-4eadc3609410f992cf3e7e70c9fe33a2d3bfd9e6.tar.gz nextcloud-server-4eadc3609410f992cf3e7e70c9fe33a2d3bfd9e6.zip | |
Merge pull request #6935 from owncloud/fix_urlGenerator
Add missing slash in URLGenerator::getAbsoluteURL().
| -rw-r--r-- | lib/private/urlgenerator.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index 4e3c1109000..60da34f2d6e 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -147,6 +147,7 @@ class URLGenerator implements IURLGenerator { * @return string the absolute version of the url */ public function getAbsoluteURL($url) { - return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . $url; + $separator = $url[0] === '/' ? '' : '/'; + return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . $separator . $url; } } |