diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2014-04-16 14:30:24 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2014-04-16 14:30:24 +0200 |
| commit | da99e403bca23e63cfa4e8becb432f95efdba606 (patch) | |
| tree | ce90006b5640a63c33ec79503576057f48c4cc8a /lib | |
| parent | 6fe3fd4a0be3a309f6337f72c6cc6a2774934864 (diff) | |
| download | nextcloud-server-da99e403bca23e63cfa4e8becb432f95efdba606.tar.gz nextcloud-server-da99e403bca23e63cfa4e8becb432f95efdba606.zip | |
Also fix linkToAbsolute
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/helper.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php index 5ce0c2e59ac..738c4944b3d 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -78,7 +78,9 @@ class OC_Helper { * Returns a absolute url to the given app and file. */ public static function linkToAbsolute($app, $file, $args = array()) { - return self::linkTo($app, $file, $args); + return OC::$server->getURLGenerator()->getAbsoluteURL( + self::linkTo($app, $file, $args) + ); } /** @@ -112,8 +114,10 @@ class OC_Helper { * Returns a absolute url to the given service. */ public static function linkToRemote($service, $add_slash = true) { - return self::makeURLAbsolute(self::linkToRemoteBase($service)) - . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : ''); + return OC::$server->getURLGenerator()->getAbsoluteURL( + self::linkToRemoteBase($service) + . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '') + ); } /** |