Deprecate functions that only call the urlgenerator anyway

diff --git a/lib/private/helper.php b/lib/private/helper.php
index 099c6def37fcc45e598c659fcd74a1ef50511370..9d7e86658b6ed18aec28b56e530736c650375a07 100644 (file)
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -132,6 +132,7 @@ class OC_Helper {
         * @return
         * @internal param array $args with param=>value, will be appended to the returned url
         * @return string the url
+        * @deprecated Use \OC::$server->getURLGenerator()->linkToRoute($route, $parameters)
         *
         * Returns a url to the given app and file.
         */
@@ -146,6 +147,7 @@ class OC_Helper {
         * @param array $args array with param=>value, will be appended to the returned url
         *    The value of $args will be urlencoded
         * @return string the url
+        * @deprecated Use \OC::$server->getURLGenerator()->linkTo($app, $file, $args)
         *
         * Returns a url to the given app and file.
         */
@@ -156,6 +158,7 @@ class OC_Helper {
        /**
         * @param string $key
         * @return string url to the online documentation
+        * @deprecated Use \OC::$server->getURLGenerator()->linkToDocs($key)
         */
        public static function linkToDocs($key) {
                return OC::$server->getURLGenerator()->linkToDocs($key);
@@ -181,6 +184,7 @@ class OC_Helper {
         * Makes an $url absolute
         * @param string $url the url
         * @return string the absolute url
+        * @deprecated Use \OC::$server->getURLGenerator()->getAbsoluteURL($url)
         *
         * Returns a absolute url to the given app and file.
         */
@@ -236,6 +240,7 @@ class OC_Helper {
         * @param string $app app
         * @param string $image image name
         * @return string the url
+        * @deprecated Use \OC::$server->getURLGenerator()->imagePath($app, $image)
         *
         * Returns the path to the image.
         */

diff --git a/lib/public/util.php b/lib/public/util.php
index 3f9b71f37a9f4228038c9302bd40902b1bde9de2..b50ce54839b05350c997decfea07c2456054c460 100644 (file)
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -260,6 +260,7 @@ class Util {
         * @param array $parameters
         * @internal param array $args with param=>value, will be appended to the returned url
         * @return string the url
+        * @deprecated Use \OC::$server->getURLGenerator()->linkToRoute($route, $parameters)
         */
        public static function linkToRoute( $route, $parameters = array() ) {
                return \OC_Helper::linkToRoute($route, $parameters);
@@ -272,6 +273,7 @@ class Util {
        * @param array $args array with param=>value, will be appended to the returned url
        *       The value of $args will be urlencoded
        * @return string the url
+       * @deprecated Use \OC::$server->getURLGenerator()->linkTo($app, $file, $args)
        */
        public static function linkTo( $app, $file, $args = array() ) {
                return(\OC_Helper::linkTo( $app, $file, $args ));
@@ -362,6 +364,7 @@ class Util {
         * @param string $app app
         * @param string $image image name
         * @return string the url
+        * @deprecated Use \OC::$server->getURLGenerator()->imagePath($app, $image)
         */
        public static function imagePath( $app, $image ) {
                return(\OC_Helper::imagePath( $app, $image ));