sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also fix linkToAbsolute

remotes/origin/ldap_group_count
Thomas Tanghus 2014-04-16 14:30:24 +07:00
parent 6fe3fd4a0b
commit da99e403bc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/helper.php
Unescape Escape View File

@ -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] != '/') ? '/' : '')
);
}
/**