[Pkg-owncloud-commits] [owncloud] 05/69: Fix linkToPublic. Refs #8218

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 6fe3fd4a0be3a309f6337f72c6cc6a2774934864
Author: Thomas Tanghus <thomas at tanghus.net>
Date:   Tue Apr 15 23:04:35 2014 +0200

    Fix linkToPublic. Refs #8218
---
 lib/private/helper.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/private/helper.php b/lib/private/helper.php
index da3d3cd..5ce0c2e 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] != '/') ? '/' : ''
+			)
+		);
 	}
 
 	/**

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git