mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15366 from rullzer/deprecate_util_links 

Deprecate functions (OC_Helper + OCP\Util) that only call the urlgenerator anyway
This commit is contained in:
Robin McCorkell 2015-04-01 18:02:10 +01:00
parent 46e43d49ac 288da619b1
commit 60821ee42e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/helper.php
View File

@ -132,6 +132,7 @@ class OC_Helper {
* @return * @return
* @internal param array $args with param=>value, will be appended to the returned url * @internal param array $args with param=>value, will be appended to the returned url
* @return string the url * @return string the url
* @deprecated Use \OC::$server->getURLGenerator()->linkToRoute($route, $parameters)
* *
* Returns a url to the given app and file. * 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 * @param array $args array with param=>value, will be appended to the returned url
* The value of $args will be urlencoded * The value of $args will be urlencoded
* @return string the url * @return string the url
* @deprecated Use \OC::$server->getURLGenerator()->linkTo($app, $file, $args)
* *
* Returns a url to the given app and file. * Returns a url to the given app and file.
*/ */
@ -156,6 +158,7 @@ class OC_Helper {
/** /**
* @param string $key * @param string $key
* @return string url to the online documentation * @return string url to the online documentation
* @deprecated Use \OC::$server->getURLGenerator()->linkToDocs($key)
*/ */
public static function linkToDocs($key) { public static function linkToDocs($key) {
return OC::$server->getURLGenerator()->linkToDocs($key); return OC::$server->getURLGenerator()->linkToDocs($key);
@ -181,6 +184,7 @@ class OC_Helper {
* Makes an $url absolute * Makes an $url absolute
* @param string $url the url * @param string $url the url
* @return string the absolute url * @return string the absolute url
* @deprecated Use \OC::$server->getURLGenerator()->getAbsoluteURL($url)
* *
* Returns a absolute url to the given app and file. * Returns a absolute url to the given app and file.
*/ */
@ -236,6 +240,7 @@ class OC_Helper {
* @param string $app app * @param string $app app
* @param string $image image name * @param string $image image name
* @return string the url * @return string the url
* @deprecated Use \OC::$server->getURLGenerator()->imagePath($app, $image)
* *
* Returns the path to the image. * Returns the path to the image.
*/ */

3
lib/public/util.php
View File

@ -260,6 +260,7 @@ class Util {
* @param array $parameters * @param array $parameters
* @internal param array $args with param=>value, will be appended to the returned url * @internal param array $args with param=>value, will be appended to the returned url
* @return string the url * @return string the url
* @deprecated Use \OC::$server->getURLGenerator()->linkToRoute($route, $parameters)
*/ */
public static function linkToRoute( $route, $parameters = array() ) { public static function linkToRoute( $route, $parameters = array() ) {
return \OC_Helper::linkToRoute($route, $parameters); 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 * @param array $args array with param=>value, will be appended to the returned url
* The value of $args will be urlencoded * The value of $args will be urlencoded
* @return string the url * @return string the url
* @deprecated Use \OC::$server->getURLGenerator()->linkTo($app, $file, $args)
*/ */
public static function linkTo( $app, $file, $args = array() ) { public static function linkTo( $app, $file, $args = array() ) {
return(\OC_Helper::linkTo( $app, $file, $args )); return(\OC_Helper::linkTo( $app, $file, $args ));
@ -362,6 +364,7 @@ class Util {
* @param string $app app * @param string $app app
* @param string $image image name * @param string $image image name
* @return string the url * @return string the url
* @deprecated Use \OC::$server->getURLGenerator()->imagePath($app, $image)
*/ */
public static function imagePath( $app, $image ) { public static function imagePath( $app, $image ) {
return(\OC_Helper::imagePath( $app, $image )); return(\OC_Helper::imagePath( $app, $image ));