OC_Helper::linkTo is deprecated

Replaced with suggested (and calling body of)

diff --git a/core/templates/404.php b/core/templates/404.php
index c8d16e3e8f707f01fc8f691b830d2a463d9f8743..2b12b12cff7172400e6c9d6f3de173f74707b8cf 100644 (file)
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -16,7 +16,7 @@ if(!isset($_)) {//also provide standalone error page
                <li class="error">
                        <?php p($l->t('File not found')); ?><br>
                        <p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p>
-                       <p class="hint"><a href="<?php p(OC_Helper::linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', array($theme->getName()))); ?></a></p>
+                       <p class="hint"><a href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', array($theme->getName()))); ?></a></p>
                </li>
        </ul>
 <?php endif; ?>

diff --git a/lib/private/helper.php b/lib/private/helper.php
index 78a567638efb879abb872eac86e51c8213b2a117..ed127a62f38d2d7aea145c94bbe6074f3efedf8d 100644 (file)
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -93,7 +93,7 @@ class OC_Helper {
         */
        public static function linkToAbsolute($app, $file, $args = array()) {
                return OC::$server->getURLGenerator()->getAbsoluteURL(
-                       self::linkTo($app, $file, $args)
+                       OC::$server->getURLGenerator()->linkTo($app, $file, $args)
                );
        }
 
@@ -117,7 +117,7 @@ class OC_Helper {
         * Returns a url to the given service.
         */
        public static function linkToRemoteBase($service) {
-               return self::linkTo('', 'remote.php') . '/' . $service;
+               return OC::$server->getURLGenerator()->linkTo('', 'remote.php') . '/' . $service;
        }
 
        /**
@@ -147,7 +147,7 @@ class OC_Helper {
                if ($service === 'files') {
                        $url = OC::$server->getURLGenerator()->getAbsoluteURL('/s');
                } else {
-                       $url = OC::$server->getURLGenerator()->getAbsoluteURL(self::linkTo('', 'public.php').'?service='.$service);
+                       $url = OC::$server->getURLGenerator()->getAbsoluteURL(OC::$server->getURLGenerator()->linkTo('', 'public.php').'?service='.$service);
                }
                return $url . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '');
        }

diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index 4ca5e16ddf2405a0451b30313be9ade682e58d93..f144c5439893ffc40ea709a53eb383b0688cff20 100644 (file)
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -92,7 +92,7 @@ class Router implements IRouter {
                $this->logger = $logger;
                $baseUrl = \OC::$WEBROOT;
                if(!(getenv('front_controller_active') === 'true')) {
-                       $baseUrl = \OC_Helper::linkTo('', 'index.php');
+                       $baseUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php');
                }
                if (!\OC::$CLI) {
                        $method = $_SERVER['REQUEST_METHOD'];

diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php
index d156d26f9ce33fe38e5ce998fee9cc6e00cd4deb..6298f25edc13a3136f930b0db9c948093fd0f70d 100644 (file)
--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
@@ -146,7 +146,7 @@ function component($app, $file) {
  * For further information have a look at OC_Helper::linkTo
  */
 function link_to( $app, $file, $args = array() ) {
-       return OC_Helper::linkTo( $app, $file, $args );
+       return \OC::$server->getURLGenerator()->linkTo($app, $file, $args);
 }
 
 /**

diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 1a6a07ddc9fb5049074e5e21166bfd7c5333681b..380e3492458a88bda5ae7f6a332d4012ae2772ab 100644 (file)
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -275,8 +275,8 @@ class OC_TemplateLayout extends OC_Template {
                        $writer->writeAsset($cssCollection);
                }
 
-               $this->append('jsfiles', OC_Helper::linkTo('assets', "$jsHash.js"));
-               $this->append('cssfiles', OC_Helper::linkTo('assets', "$cssHash.css"));
+               $this->append('jsfiles', \OC::$server->getURLGenerator()->linkTo('assets', "$jsHash.js"));
+               $this->append('cssfiles', \OC::$server->getURLGenerator()->linkTo('assets', "$cssHash.css"));
        }
 
        /**

diff --git a/lib/public/util.php b/lib/public/util.php
index 4e783b764ed3d8647e4ab2a849536aac754804cd..e0c875438f269c4d8c19311e7203f2c0b51e8391 100644 (file)
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -316,7 +316,7 @@ class Util {
         * @since 4.0.0 - parameter $args was added in 4.5.0
         */
        public static function linkTo( $app, $file, $args = array() ) {
-               return(\OC_Helper::linkTo( $app, $file, $args ));
+               return \OC::$server->getURLGenerator()->linkTo($app, $file, $args);
        }
 
        /**