Georggi199 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333217 )
Change subject: Replaced all deprecated Linker methods with proper ones in
core(2)
......................................................................
Replaced all deprecated Linker methods with proper ones in core(2)
Change-Id: I5e9e559e4b73dd2730dffc0b86853abdef5c5bd5
---
M includes/actions/InfoAction.php
M includes/diff/DifferenceEngine.php
M includes/gallery/TraditionalImageGallery.php
M includes/logging/LogFormatter.php
M includes/logging/LogPage.php
M includes/logging/MergeLogFormatter.php
M includes/logging/MoveLogFormatter.php
M includes/logging/PatrolLogFormatter.php
M includes/logging/ProtectLogFormatter.php
9 files changed, 45 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/17/333217/1
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 5fb83b3..c66416a 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -388,7 +388,7 @@
$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' )->text() ),
$this->msg( 'pageinfo-subpages-value' )
->numParams(
$pageCounts['subpages']['total'],
diff --git a/includes/diff/DifferenceEngine.php
b/includes/diff/DifferenceEngine.php
index 559a5ec..7c4e862 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -20,6 +20,7 @@
* @file
* @ingroup DifferenceEngine
*/
+use MediaWiki\MediaWikiServices;
/** @deprecated use class constant instead */
define( 'MW_DIFF_VERSION', '1.11a' );
@@ -242,6 +243,7 @@
$out = $this->getOutput();
$out->allowClickjacking();
$out->setRobotPolicy( 'noindex,nofollow' );
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
// Allow extensions to add any extra output here
Hooks::run( 'DifferenceEngineShowDiffPage', [ $out ] );
@@ -331,9 +333,9 @@
# Make "previous revision link"
if ( $samePage && $this->mOldRev->getPrevious() ) {
- $prevlink = Linker::linkKnown(
+ $prevlink = $linkRenderer->makeKnownLink(
$this->mOldPage,
- $this->msg( 'previousdiff' )->escaped(),
+ $this->msg( 'previousdiff' )->text(),
[ 'id' => 'differences-prevlink' ],
[ 'diff' => 'prev', 'oldid' =>
$this->mOldid ] + $query
);
@@ -379,9 +381,9 @@
# Make "next revision link"
# Skip next link on the top revision
if ( $samePage && !$this->mNewRev->isCurrent() ) {
- $nextlink = Linker::linkKnown(
+ $nextlink = $linkRenderer->makeKnownLink(
$this->mNewPage,
- $this->msg( 'nextdiff' )->escaped(),
+ $this->msg( 'nextdiff' )->text(),
[ 'id' => 'differences-nextlink' ],
[ 'diff' => 'next', 'oldid' => $this->mNewid ]
+ $query
);
@@ -489,10 +491,11 @@
if ( !$linkInfo ) {
$this->mMarkPatrolledLink = '';
} else {
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
$this->mMarkPatrolledLink = ' <span
class="patrollink" data-mw="interface">[' .
- Linker::linkKnown(
+ $linkRenderer->makeKnownLink(
$this->mNewPage,
- $this->msg(
'markaspatrolleddiff' )->escaped(),
+ $this->msg(
'markaspatrolleddiff' )->text(),
[],
[
'action' =>
'markpatrolled',
@@ -1072,6 +1075,7 @@
$timestamp = $lang->userTimeAndDate( $revtimestamp, $user );
$dateofrev = $lang->userDate( $revtimestamp, $user );
$timeofrev = $lang->userTime( $revtimestamp, $user );
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
$header = $this->msg(
$rev->isCurrent() ? 'currentrev-asof' : 'revisionasof',
@@ -1086,7 +1090,7 @@
$title = $rev->getTitle();
- $header = Linker::linkKnown( $title, $header, [],
+ $header = $linkRenderer->makeKnownLink( $title, new HtmlArmor(
$header ), [],
[ 'oldid' => $rev->getId() ] );
if ( $rev->userCan( Revision::DELETED_TEXT, $user ) ) {
@@ -1096,9 +1100,9 @@
}
$key = $title->quickUserCan( 'edit', $user ) ?
'editold' : 'viewsourceold';
- $msg = $this->msg( $key )->escaped();
+ $msg = $this->msg( $key )->text();
$editLink = $this->msg( 'parentheses' )->rawParams(
- Linker::linkKnown( $title, $msg, [], $editQuery
) )->escaped();
+ $linkRenderer->makeKnownLink( $title, $msg, [],
$editQuery ) )->escaped();
$header .= ' ' . Html::rawElement(
'span',
[ 'class' => 'mw-diff-edit' ],
diff --git a/includes/gallery/TraditionalImageGallery.php
b/includes/gallery/TraditionalImageGallery.php
index 1fd7b0a..66c7b8f 100644
--- a/includes/gallery/TraditionalImageGallery.php
+++ b/includes/gallery/TraditionalImageGallery.php
@@ -19,6 +19,7 @@
*
* @file
*/
+use MediaWiki\MediaWikiServices;
class TraditionalImageGallery extends ImageGalleryBase {
/**
@@ -46,6 +47,7 @@
[ 'class' => 'gallery mw-gallery-' . $this->mMode ],
$this->mAttribs );
$modules = $this->getModules();
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
if ( $this->mParser ) {
$this->mParser->getOutput()->addModules( $modules );
@@ -116,9 +118,9 @@
# The image is blacklisted, just show it as a
text link.
$thumbhtml = "\n\t\t\t" . '<div class="thumb"
style="height: ' .
( $this->getThumbPadding() +
$this->mHeights ) . 'px;">' .
- Linker::linkKnown(
+ $linkRenderer->makeKnownLink(
$nt,
- htmlspecialchars(
$nt->getText() )
+ $nt->getText()
) .
'</div>';
} else {
@@ -187,9 +189,9 @@
$textlink = $this->mShowFilename ?
// Preloaded into LinkCache above
- Linker::linkKnown(
+ $linkRenderer->makeKnownLink(
$nt,
- htmlspecialchars(
+ (
$this->mCaptionLength !== true ?
$lang->truncate(
$nt->getText(), $this->mCaptionLength ) :
$nt->getText()
diff --git a/includes/logging/LogFormatter.php
b/includes/logging/LogFormatter.php
index a64fee1..9ef532a 100644
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -22,6 +22,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
* @since 1.19
*/
+use MediaWiki\MediaWikiServices;
/**
* Implements the default log formatting.
@@ -610,7 +611,8 @@
*/
protected function makePageLink( Title $title = null, $parameters = [],
$html = null ) {
if ( !$this->plaintext ) {
- $link = Linker::link( $title, $html, [], $parameters );
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
+ $link = $linkRenderer->makeKnownLink( $title, new
HtmlArmor( $html ), [], $parameters );
} else {
if ( !$title instanceof Title ) {
throw new MWException( "Expected title, got
null" );
diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index 64102b7..94dcc15 100644
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -22,6 +22,7 @@
*
* @file
*/
+use MediaWiki\MediaWikiServices;
/**
* Class to simplify the use of log pages.
@@ -297,22 +298,23 @@
return $title->getPrefixedText();
}
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
if ( $title->isSpecialPage() ) {
list( $name, $par ) = SpecialPageFactory::resolveAlias(
$title->getDBkey() );
# Use the language name for log titles, rather than
Log/X
if ( $name == 'Log' ) {
$logPage = new LogPage( $par );
- $titleLink = Linker::link( $title,
$logPage->getName()->escaped() );
+ $titleLink = $linkRenderer->makeLink( $title,
$logPage->getName()->text() );
$titleLink = wfMessage( 'parentheses' )
->inLanguage( $lang )
->rawParams( $titleLink )
->escaped();
} else {
- $titleLink = Linker::link( $title );
+ $titleLink = $linkRenderer->makeLink( $title );
}
} else {
- $titleLink = Linker::link( $title );
+ $titleLink = $linkRenderer->makeLink( $title );
}
return $titleLink;
diff --git a/includes/logging/MergeLogFormatter.php
b/includes/logging/MergeLogFormatter.php
index b0edd4c..5687cb9 100644
--- a/includes/logging/MergeLogFormatter.php
+++ b/includes/logging/MergeLogFormatter.php
@@ -21,6 +21,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
* @since 1.25
*/
+use MediaWiki\MediaWikiServices;
/**
* This class formats merge log entries.
@@ -52,11 +53,12 @@
return '';
}
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
// Show unmerge link
$params = $this->extractParameters();
- $revert = Linker::linkKnown(
+ $revert = $linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'MergeHistory' ),
- $this->msg( 'revertmerge' )->escaped(),
+ $this->msg( 'revertmerge' )->text(),
[],
[
'target' => $params[3],
diff --git a/includes/logging/MoveLogFormatter.php
b/includes/logging/MoveLogFormatter.php
index afbf8e9..40fc787 100644
--- a/includes/logging/MoveLogFormatter.php
+++ b/includes/logging/MoveLogFormatter.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 move log entries.
@@ -71,9 +72,10 @@
return '';
}
- $revert = Linker::linkKnown(
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
+ $revert = $linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Movepage' ),
- $this->msg( 'revertmove' )->escaped(),
+ $this->msg( 'revertmove' )->text(),
[],
[
'wpOldTitle' => $destTitle->getPrefixedDBkey(),
diff --git a/includes/logging/PatrolLogFormatter.php
b/includes/logging/PatrolLogFormatter.php
index 5b933ce..70807e2 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,8 @@
'oldid' => $oldid,
'diff' => 'prev'
];
- $revlink = Linker::link( $target, htmlspecialchars(
$revision ), [], $query );
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
+ $revlink = $linkRenderer->makeLink( $target, $revision,
[], $query );
} else {
$revlink = htmlspecialchars( $revision );
}
diff --git a/includes/logging/ProtectLogFormatter.php
b/includes/logging/ProtectLogFormatter.php
index 0458297..1da96bf 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.
@@ -84,11 +85,12 @@
return '';
}
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
// Show history link for all changes after the protection
$title = $this->entry->getTarget();
$links = [
- Linker::link( $title,
- $this->msg( 'hist' )->escaped(),
+ $linkRenderer->makeLink( $title,
+ $this->msg( 'hist' )->text(),
[],
[
'action' => 'history',
@@ -99,9 +101,9 @@
// Show change protection link
if ( $this->context->getUser()->isAllowed( 'protect' ) ) {
- $links[] = Linker::linkKnown(
+ $links[] = $linkRenderer->makeKnownLink(
$title,
- $this->msg( 'protect_change' )->escaped(),
+ $this->msg( 'protect_change' )->text(),
[],
[ 'action' => 'protect' ]
);
--
To view, visit https://gerrit.wikimedia.org/r/333217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e9e559e4b73dd2730dffc0b86853abdef5c5bd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Georggi199 <bmp2...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
