Victorbarbu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/324819
Change subject: Replace some usages of Liner::link with LinkRenderer
......................................................................
Replace some usages of Liner::link with LinkRenderer
Classes:
CreditsAction
HistoryAction
InfoAction
CacheHelper
ChangeTagsLogItem
ContentModelLogFormatter
PatrolLogFormatter
ProtectLogFormatter
Bug: T149346
Change-Id: If02094df5dd7acc6efd02e540515f8e472ec3d4d
---
M includes/actions/CreditsAction.php
M includes/actions/HistoryAction.php
M includes/actions/InfoAction.php
M includes/cache/CacheHelper.php
M includes/changetags/ChangeTagsLogItem.php
M includes/logging/ContentModelLogFormatter.php
M includes/logging/PatrolLogFormatter.php
M includes/logging/ProtectLogFormatter.php
8 files changed, 41 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/19/324819/1
diff --git a/includes/actions/CreditsAction.php
b/includes/actions/CreditsAction.php
index 1332ab4..198213c 100644
--- a/includes/actions/CreditsAction.php
+++ b/includes/actions/CreditsAction.php
@@ -205,7 +205,9 @@
? SpecialPage::getTitleFor( 'Contributions',
$user->getName() )
: $user->getUserPage();
- return Linker::link( $page, htmlspecialchars( $real ? $real :
$user->getName() ) );
+ return
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
+ $page, htmlspecialchars( $real ? $real :
$user->getName() )
+ );
}
/**
@@ -231,7 +233,7 @@
* @return string HTML link
*/
protected function othersLink() {
- return Linker::linkKnown(
+ return
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
$this->msg( 'others' )->escaped(),
[],
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index c1763fa..703adfe 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -58,7 +58,7 @@
protected function getDescription() {
// Creation of a subtitle link pointing to [[Special:Log]]
- return Linker::linkKnown(
+ return
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
SpecialPage::getTitleFor( 'Log' ),
$this->msg( 'viewpagelogs' )->escaped(),
[],
@@ -734,7 +734,8 @@
$undoTooltip = $latest
? [ 'title' => $this->msg(
'tooltip-undo' )->text() ]
: [];
- $undolink = Linker::linkKnown(
+ $linkRenderer =
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer();
+ $undolink = $linkRenderer->makeKnownLink(
$this->getTitle(),
$this->msg( 'editundo' )->escaped(),
$undoTooltip,
@@ -790,7 +791,7 @@
$date = $this->getLanguage()->userTimeAndDate(
$rev->getTimestamp(), $this->getUser() );
$date = htmlspecialchars( $date );
if ( $rev->userCan( Revision::DELETED_TEXT, $this->getUser() )
) {
- $link = Linker::linkKnown(
+ $link =
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
$date,
[ 'class' => 'mw-changeslist-date' ],
@@ -818,7 +819,7 @@
if ( $latest || !$rev->userCan( Revision::DELETED_TEXT,
$this->getUser() ) ) {
return $cur;
} else {
- return Linker::linkKnown(
+ return
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
$cur,
[],
@@ -849,7 +850,7 @@
if ( $next === 'unknown' ) {
# Next row probably exists but is unknown, use an
oldid=prev link
- return Linker::linkKnown(
+ return
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
$last,
[],
@@ -868,7 +869,7 @@
return $last;
}
- return Linker::linkKnown(
+ return
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
$this->getTitle(),
$last,
[],
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index be3be85..ec154bd 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -230,9 +230,9 @@
if ( $title->isRedirect() ) {
$pageInfo['header-basic'][] = [
$this->msg( 'pageinfo-redirectsto' ),
- Linker::link( $this->page->getRedirectTarget()
) .
+ $linkRenderer->makeLink(
$this->page->getRedirectTarget() ) .
$this->msg( 'word-separator' )->escaped() .
- $this->msg( 'parentheses' )->rawParams(
Linker::link(
+ $this->msg( 'parentheses' )->rawParams(
$linkRenderer->makeLink(
$this->page->getRedirectTarget(),
$this->msg( 'pageinfo-redirectsto-info'
)->escaped(),
[],
@@ -266,7 +266,7 @@
) {
// Link to Special:PageLanguage with pre-filled page
title if user has permissions
$titleObj = SpecialPage::getTitleFor( 'PageLanguage',
$title->getPrefixedText() );
- $langDisp = Linker::link(
+ $langDisp = $linkRenderer->makeLink(
$titleObj,
$this->msg( 'pageinfo-language' )->escaped()
);
@@ -360,7 +360,7 @@
// Redirects to this page
$whatLinksHere = SpecialPage::getTitleFor( 'Whatlinkshere',
$title->getPrefixedText() );
$pageInfo['header-basic'][] = [
- Linker::link(
+ $linkRenderer->makeLink(
$whatLinksHere,
$this->msg( 'pageinfo-redirects-name'
)->escaped(),
[],
@@ -387,7 +387,9 @@
$prefixIndex = SpecialPage::getTitleFor(
'Prefixindex', $title->getPrefixedText() . '/'
);
$pageInfo['header-basic'][] = [
- Linker::link( $prefixIndex, $this->msg(
'pageinfo-subpages-name' )->escaped() ),
+ $linkRenderer->makeLink(
+ $prefixIndex, $this->msg(
'pageinfo-subpages-name' )->escaped()
+ ),
$this->msg( 'pageinfo-subpages-value' )
->numParams(
$pageCounts['subpages']['total'],
@@ -436,7 +438,7 @@
foreach ( $sources as $sourceTitle ) {
$cascadingFrom .= Html::rawElement(
- 'li', [], Linker::linkKnown(
$sourceTitle ) );
+ 'li', [], $linkRenderer->makeLink(
$sourceTitle ) );
}
$cascadingFrom = Html::rawElement( 'ul', [],
$cascadingFrom );
@@ -525,7 +527,7 @@
// Date of page creation
$pageInfo['header-edits'][] = [
$this->msg( 'pageinfo-firsttime' ),
- Linker::linkKnown(
+ $linkRenderer->makeKnownLink(
$title,
htmlspecialchars(
$lang->userTimeAndDate( $firstRev->getTimestamp(), $user ) ),
[],
@@ -544,7 +546,7 @@
// Date of latest edit
$pageInfo['header-edits'][] = [
$this->msg( 'pageinfo-lasttime' ),
- Linker::linkKnown(
+ $linkRenderer->makeKnownLink(
$title,
htmlspecialchars(
$lang->userTimeAndDate(
$this->page->getTimestamp(), $user )
@@ -655,7 +657,7 @@
if ( !$config->get( 'MiserMode' ) &&
$pageCounts['transclusion']['to'] > 0 ) {
if ( $pageCounts['transclusion']['to'] > count(
$transcludedTargets ) ) {
- $more = Linker::link(
+ $more = $linkRenderer->makeLink(
$whatLinksHere,
$this->msg( 'moredotdotdot'
)->escaped(),
[],
@@ -832,6 +834,7 @@
* @return string Html
*/
protected function getContributors() {
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
$contributors = $this->page->getContributors();
$real_names = [];
$user_names = [];
@@ -846,11 +849,11 @@
$hiddenPrefs = $this->context->getConfig()->get(
'HiddenPrefs' );
if ( $user->getId() == 0 ) {
- $anon_ips[] = Linker::link( $page,
htmlspecialchars( $user->getName() ) );
+ $anon_ips[] = $linkRenderer->makeLink( $page,
htmlspecialchars( $user->getName() ) );
} elseif ( !in_array( 'realname', $hiddenPrefs ) &&
$user->getRealName() ) {
- $real_names[] = Linker::link( $page,
htmlspecialchars( $user->getRealName() ) );
+ $real_names[] = $linkRenderer->makeLink( $page,
htmlspecialchars( $user->getRealName() ) );
} else {
- $user_names[] = Linker::link( $page,
htmlspecialchars( $user->getName() ) );
+ $user_names[] = $linkRenderer->makeLink( $page,
htmlspecialchars( $user->getName() ) );
}
}
diff --git a/includes/cache/CacheHelper.php b/includes/cache/CacheHelper.php
index fb461b7..e821021 100644
--- a/includes/cache/CacheHelper.php
+++ b/includes/cache/CacheHelper.php
@@ -21,6 +21,7 @@
* @license GNU GPL v2 or later
* @author Jeroen De Dauw < jeroended...@gmail.com >
*/
+use MediaWiki\MediaWikiServices;
/**
* Interface for all classes implementing CacheHelper functionality.
@@ -217,7 +218,7 @@
$subPage = explode( '/', $subPage, 2 );
$subPage = count( $subPage ) > 1 ? $subPage[1] : false;
- $message .= ' ' . Linker::link(
+ $message .= ' ' .
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
$context->getTitle( $subPage ),
$context->msg( 'cachedspecial-refresh-now'
)->escaped(),
[],
diff --git a/includes/changetags/ChangeTagsLogItem.php
b/includes/changetags/ChangeTagsLogItem.php
index 2dc953c..6ade98b 100644
--- a/includes/changetags/ChangeTagsLogItem.php
+++ b/includes/changetags/ChangeTagsLogItem.php
@@ -18,6 +18,7 @@
* @file
* @ingroup Change tagging
*/
+use MediaWiki\MediaWikiServices;
/**
* Item class for a logging table row with its associated change tags.
@@ -70,7 +71,7 @@
$formatter->setAudience( LogFormatter::FOR_THIS_USER );
// Log link for this page
- $loglink = Linker::link(
+ $loglink =
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor( 'Log' ),
$this->list->msg( 'log' )->escaped(),
[],
diff --git a/includes/logging/ContentModelLogFormatter.php
b/includes/logging/ContentModelLogFormatter.php
index f130740..92f3f87 100644
--- a/includes/logging/ContentModelLogFormatter.php
+++ b/includes/logging/ContentModelLogFormatter.php
@@ -1,5 +1,7 @@
<?php
+use MediaWiki\MediaWikiServices;
+
class ContentModelLogFormatter extends LogFormatter {
protected function getMessageParameters() {
$lang = $this->context->getLanguage();
@@ -18,7 +20,7 @@
}
$params = $this->extractParameters();
- $revert = Linker::linkKnown(
+ $revert =
MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
SpecialPage::getTitleFor( 'ChangeContentModel' ),
$this->msg( 'logentry-contentmodel-change-revertlink'
)->escaped(),
[],
diff --git a/includes/logging/PatrolLogFormatter.php
b/includes/logging/PatrolLogFormatter.php
index 5b933ce..3a7c580 100644
--- a/includes/logging/PatrolLogFormatter.php
+++ b/includes/logging/PatrolLogFormatter.php
@@ -22,6 +22,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
* @since 1.22
*/
+use MediaWiki\MediaWikiServices;
/**
* This class formats patrol log entries.
@@ -54,7 +55,9 @@
'oldid' => $oldid,
'diff' => 'prev'
];
- $revlink = Linker::link( $target, htmlspecialchars(
$revision ), [], $query );
+ $revlink =
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
+ $target, htmlspecialchars( $revision ), [],
$query
+ );
} else {
$revlink = htmlspecialchars( $revision );
}
diff --git a/includes/logging/ProtectLogFormatter.php
b/includes/logging/ProtectLogFormatter.php
index 0458297..ab9ebea 100644
--- a/includes/logging/ProtectLogFormatter.php
+++ b/includes/logging/ProtectLogFormatter.php
@@ -21,6 +21,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
* @since 1.26
*/
+use MediaWiki\MediaWikiServices;
/**
* This class formats protect log entries.
@@ -77,6 +78,7 @@
}
public function getActionLinks() {
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
$subtype = $this->entry->getSubtype();
if ( $this->entry->isDeleted( LogPage::DELETED_ACTION ) //
Action is hidden
|| $subtype === 'move_prot' // the move log entry has
the right action link
@@ -87,7 +89,7 @@
// Show history link for all changes after the protection
$title = $this->entry->getTarget();
$links = [
- Linker::link( $title,
+ $linkRenderer->makeLink( $title,
$this->msg( 'hist' )->escaped(),
[],
[
@@ -99,7 +101,7 @@
// Show change protection link
if ( $this->context->getUser()->isAllowed( 'protect' ) ) {
- $links[] = Linker::linkKnown(
+ $links[] = $linkRenderer->makeKnownLink(
$title,
$this->msg( 'protect_change' )->escaped(),
[],
--
To view, visit https://gerrit.wikimedia.org/r/324819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If02094df5dd7acc6efd02e540515f8e472ec3d4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Victorbarbu <victorbarb...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
