diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-18 14:49:55 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-18 14:49:55 +0100 |
| commit | 50e877330700117ace281236ce7ecc1ae0f9521b (patch) | |
| tree | 5ae40fa7903eb2ea05962d87032704b3150316f1 /lib/public | |
| parent | 22d1b1285e970447f532919368ebffeeb8c2ebf7 (diff) | |
| parent | 450e2f3bd308388e5df01b2b2ea38e6bf16b1c67 (diff) | |
| download | nextcloud-server-50e877330700117ace281236ce7ecc1ae0f9521b.tar.gz nextcloud-server-50e877330700117ace281236ce7ecc1ae0f9521b.zip | |
Merge pull request #21280 from owncloud/drop-unused-methods
OC_Helper::makeURLAbsolute is not used anymore
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/util.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/public/util.php b/lib/public/util.php index da4aa6e9deb..a9fe0e47de6 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -269,7 +269,10 @@ class Util { * @since 4.0.0 - parameter $args was added in 4.5.0 */ public static function linkToAbsolute( $app, $file, $args = array() ) { - return(\OC_Helper::linkToAbsolute( $app, $file, $args )); + $urlGenerator = \OC::$server->getURLGenerator(); + return $urlGenerator->getAbsoluteURL( + $urlGenerator->linkTo($app, $file, $args) + ); } /** @@ -279,7 +282,11 @@ class Util { * @since 4.0.0 */ public static function linkToRemote( $service ) { - return(\OC_Helper::linkToRemote( $service )); + $urlGenerator = \OC::$server->getURLGenerator(); + $remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service; + return $urlGenerator->getAbsoluteURL( + $remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '') + ); } /** |