OC_Helper::linkTo is deprecated
Replaced with suggested (and calling body of)
This commit is contained in:
parent
c92b49c82a
commit
19eeb23b91
|
@ -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; ?>
|
||||
|
|
|
@ -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] != '/') ? '/' : '');
|
||||
}
|
||||
|
|
|
@ -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'];
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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"));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue