sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21248 from owncloud/deprecated_oc_helper_linkToRoute 

Replace deprecated OC_Helper::linkToRoute calls
remotes/origin/appinfo-object
Thomas Müller 2015-12-18 07:56:42 +07:00
parent d77019f566 2a280e2fad
commit 228a75e2ec
6 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/app.php
Unescape Escape View File

@ -380,7 +380,7 @@ class OC_App {
array(
"id" => "help",
"order" => 1000,
"href" => OC_Helper::linkToRoute("settings_help"),
"href" => \OC::$server->getURLGenerator()->linkToRoute('settings_help'),
"name" => $l->t("Help"),
"icon" => OC_Helper::imagePath("settings", "help.svg")
)
@ -393,7 +393,7 @@ class OC_App {
$settings[] = array(
"id" => "personal",
"order" => 1,
"href" => OC_Helper::linkToRoute("settings_personal"),
"href" => \OC::$server->getURLGenerator()->linkToRoute('settings_personal'),
"name" => $l->t("Personal"),
"icon" => OC_Helper::imagePath("settings", "personal.svg")
);
@ -409,7 +409,7 @@ class OC_App {
$settings[] = array(
"id" => "core_users",
"order" => 2,
"href" => OC_Helper::linkToRoute("settings_users"),
"href" => \OC::$server->getURLGenerator()->linkToRoute('settings_users'),
"name" => $l->t("Users"),
"icon" => OC_Helper::imagePath("settings", "users.svg")
);
@ -421,7 +421,7 @@ class OC_App {
$settings[] = array(
"id" => "admin",
"order" => 1000,
"href" => OC_Helper::linkToRoute("settings_admin"),
"href" => \OC::$server->getURLGenerator()->linkToRoute('settings_admin'),
"name" => $l->t("Admin"),
"icon" => OC_Helper::imagePath("settings", "admin.svg")
);

17
lib/private/helper.php
Unescape Escape View File

@ -53,19 +53,6 @@ use Symfony\Component\Process\ExecutableFinder;
class OC_Helper {
private static $templateManager;
/**
* Creates an url using a defined route
* @param string $route
* @param array $parameters 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.
*/
public static function linkToRoute($route, $parameters = array()) {
return OC::$server->getURLGenerator()->linkToRoute($route, $parameters);
}
/**
* Creates an absolute url
* @param string $app app
@ -170,11 +157,11 @@ class OC_Helper {
* Returns the path to the preview of the file.
*/
public static function previewIcon($path) {
return self::linkToRoute( 'core_ajax_preview', array('x' => 32, 'y' => 32, 'file' => $path ));
return \OC::$server->getURLGenerator()->linkToRoute('core_ajax_preview', ['x' => 32, 'y' => 32, 'file' => $path]);
}
public static function publicPreviewIcon( $path, $token ) {
return self::linkToRoute( 'core_ajax_public_preview', array('x' => 32, 'y' => 32, 'file' => $path, 't' => $token));
return \OC::$server->getURLGenerator()->linkToRoute('core_ajax_public_preview', ['x' => 32, 'y' => 32, 'file' => $path, 't' => $token]);
}
/**

4
lib/private/templatelayout.php
Unescape Escape View File

@ -165,14 +165,14 @@ class OC_TemplateLayout extends OC_Template {
$useAssetPipeline = self::isAssetPipelineEnabled();
if ($useAssetPipeline) {
$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
$this->append( 'jsfiles', \OC::$server->getURLGenerator()->linkToRoute('js_config', ['v' => self::$versionHash]));
$this->generateAssets();
} else {
// Add the js files
$jsFiles = self::findJavascriptFiles(OC_Util::$scripts);
$this->assign('jsfiles', array());
if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
$this->append( 'jsfiles', \OC::$server->getURLGenerator()->linkToRoute('js_config', ['v' => self::$versionHash]));
}
foreach($jsFiles as $info) {
$web = $info[1];

2
lib/public/util.php
Unescape Escape View File

@ -302,7 +302,7 @@ class Util {
* @since 5.0.0
*/
public static function linkToRoute( $route, $parameters = array() ) {
return \OC_Helper::linkToRoute($route, $parameters);
return \OC::$server->getURLGenerator()->linkToRoute($route, $parameters);
}
/**

4
settings/help.php
Unescape Escape View File

@ -43,8 +43,8 @@ if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
$style2='';
}
$url1=OC_Helper::linkToRoute( "settings_help" ).'?mode=user';
$url2=OC_Helper::linkToRoute( "settings_help" ).'?mode=admin';
$url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';
$url2=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin';
$tmpl = new OC_Template( "settings", "help", "user" );
$tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser()));

2
settings/templates/personal.php
Unescape Escape View File

@ -149,7 +149,7 @@ if($_['passwordChangeSupported']) {
</div>
<?php if ($_['enableAvatars']): ?>
<form id="avatar" class="section" method="post" action="<?php p(\OC_Helper::linkToRoute('core.avatar.postAvatar')); ?>">
<form id="avatar" class="section" method="post" action="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.postAvatar')); ?>">
<h2><?php p($l->t('Profile picture')); ?></h2>
<div id="displayavatar">
<div class="avatardiv"></div><br>