summaryrefslogtreecommitdiffstats
path: root/lib/private/urlgenerator.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-03-28 12:12:49 +0100
committerVincent Petry <pvince81@owncloud.com>2014-03-28 12:12:49 +0100
commit5068c57845ab43e4d74ec9ff3e23d7dccc580a86 (patch)
tree732e64a2dbd14654ee7a09ad61c2c04746af906f /lib/private/urlgenerator.php
parent2d592ddc8f26e72211d1c01cec8979cd371b8215 (diff)
parentada8d4e0c91a885ca21db6b2bf4ca5d5c932e51b (diff)
downloadnextcloud-server-5068c57845ab43e4d74ec9ff3e23d7dccc580a86.tar.gz
nextcloud-server-5068c57845ab43e4d74ec9ff3e23d7dccc580a86.zip
Merge pull request #7613 from owncloud/fix_urlGenerator2
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
Diffstat (limited to 'lib/private/urlgenerator.php')
-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 b7ae8dd0f60..0d238737dde 100644
--- a/lib/private/urlgenerator.php
+++ b/lib/private/urlgenerator.php
@@ -148,6 +148,7 @@ class URLGenerator implements IURLGenerator {
*/
public function getAbsoluteURL($url) {
$separator = $url[0] === '/' ? '' : '/';
- return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . $separator . $url;
+
+ return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost(). \OC::$WEBROOT . $separator . $url;
}
}