summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2014-02-07 17:39:19 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2014-02-20 18:19:05 +0100
commit91b40457917d74a95e08ac75d98e652350f750ae (patch)
treea7b6c138ff13ff6dd3e1d0b3adf3943a6db04248 /lib
parent0f87a0248fbc01ca876667ab9680253987d3f12f (diff)
downloadnextcloud-server-91b40457917d74a95e08ac75d98e652350f750ae.tar.gz
nextcloud-server-91b40457917d74a95e08ac75d98e652350f750ae.zip
Test if $url is already prefixed by '/'
Diffstat (limited to 'lib')
-rw-r--r--lib/private/urlgenerator.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php
index 7ed44c44515..13f4cdfb728 100644
--- a/lib/private/urlgenerator.php
+++ b/lib/private/urlgenerator.php
@@ -124,6 +124,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;
}
}