diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-03-28 15:12:49 +0400 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-03-28 15:12:49 +0400 |
| commit | 5068c57845ab43e4d74ec9ff3e23d7dccc580a86 (patch) | |
| tree | 732e64a2dbd14654ee7a09ad61c2c04746af906f /lib/private/urlgenerator.php | |
| parent | 2d592ddc8f26e72211d1c01cec8979cd371b8215 (diff) | |
| parent | ada8d4e0c91a885ca21db6b2bf4ca5d5c932e51b (diff) | |
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.php | 3 |
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; } } |