From 5f610a1cbc5a97bd4f097111536516f547a94fda Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Fri, 24 Jan 2014 16:40:32 +0100 Subject: Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840 --- lib/private/urlgenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index 4e3c1109000..e618aef268a 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -147,6 +147,6 @@ class URLGenerator implements IURLGenerator { * @return string the absolute version of the url */ public function getAbsoluteURL($url) { - return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . $url; + return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . '/' . $url; } } -- cgit v1.2.3 From 2ff0d3a2552ea18e6e73a9de9332f89f723a1495 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Fri, 7 Feb 2014 17:39:19 +0100 Subject: Test if $url is already prefixed by '/' --- lib/private/urlgenerator.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index e618aef268a..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; } } -- cgit v1.2.3