From 6fe3fd4a0be3a309f6337f72c6cc6a2774934864 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Tue, 15 Apr 2014 23:04:35 +0200 Subject: Fix linkToPublic. Refs #8218 --- lib/private/helper.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/private/helper.php') diff --git a/lib/private/helper.php b/lib/private/helper.php index da3d3cd1c6e..5ce0c2e59ac 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -125,8 +125,12 @@ class OC_Helper { * Returns a absolute url to the given service. */ public static function linkToPublic($service, $add_slash = false) { - return self::linkToAbsolute('', 'public.php') . '?service=' . $service - . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : ''); + return OC::$server->getURLGenerator()->getAbsoluteURL( + self::linkTo( + '', 'public.php') . '?service=' . $service + . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '' + ) + ); } /** -- cgit v1.2.3 From da99e403bca23e63cfa4e8becb432f95efdba606 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 16 Apr 2014 14:30:24 +0200 Subject: Also fix linkToAbsolute --- lib/private/helper.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/private/helper.php') 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] != '/') ? '/' : '') + ); } /** -- cgit v1.2.3