Matěj Suchánek has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339815 )
Change subject: Replace Linker::link() with LinkRenderer
......................................................................
Replace Linker::link() with LinkRenderer
This raises MediaWiki version requirement to 1.28.0.
Bug: T149346
Change-Id: I1d65a319d11f41c933b1348c6a52b91ec4935025
---
M SpecialGlobalUsage.php
M SpecialGloballyWantedFiles.php
M extension.json
3 files changed, 16 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUsage
refs/changes/15/339815/2
diff --git a/SpecialGlobalUsage.php b/SpecialGlobalUsage.php
index abfbc9d..8c23783 100644
--- a/SpecialGlobalUsage.php
+++ b/SpecialGlobalUsage.php
@@ -228,14 +228,15 @@
}
# Get prev/next link display text
- $prev = $this->msg( 'prevn' )->numParams( $limit )->escaped();
- $next = $this->msg( 'nextn' )->numParams( $limit )->escaped();
+ $prevMsg = $this->msg( 'prevn' )->numParams( $limit );
+ $nextMsg = $this->msg( 'nextn' )->numParams( $limit );
# Get prev/next link title text
$pTitle = $this->msg( 'prevn-title' )->numParams( $limit
)->escaped();
$nTitle = $this->msg( 'nextn-title' )->numParams( $limit
)->escaped();
# Fetch the title object
$title = $this->getPageTitle();
+ $linkRenderer = $this->getLinkRenderer();
# Make 'previous' link
if ( $to ) {
@@ -244,9 +245,9 @@
if ( $this->filterLocal ) {
$q['filterlocal'] = '1';
}
- $plink = Linker::link( $title, $prev, $attr, $q );
+ $plink = $linkRenderer->makeLink( $title,
$prevMsg->text(), $attr, $q );
} else {
- $plink = $prev;
+ $plink = $prevMsg->escaped();
}
# Make 'next' link
@@ -256,9 +257,9 @@
if ( $this->filterLocal ) {
$q['filterlocal'] = '1';
}
- $nlink = Linker::link( $title, $next, $attr, $q );
+ $nlink = $linkRenderer->makeLink( $title,
$nextMsg->text(), $attr, $q );
} else {
- $nlink = $next;
+ $nlink = $nextMsg->escaped();
}
# Make links to set number of items per page
@@ -274,7 +275,7 @@
$lTitle = $this->msg( 'shown-title' )->numParams( $num
)->escaped();
$attr = array( 'title' => $lTitle, 'class' =>
'mw-numlink' );
- $numLinks[] = Linker::link( $title, $fmtLimit, $attr,
$q );
+ $numLinks[] = $linkRenderer->makeLink( $title,
$fmtLimit, $attr, $q );
}
$nums = $lang->pipeList( $numLinks );
diff --git a/SpecialGloballyWantedFiles.php b/SpecialGloballyWantedFiles.php
index 3471c96..56479ec 100644
--- a/SpecialGloballyWantedFiles.php
+++ b/SpecialGloballyWantedFiles.php
@@ -87,18 +87,19 @@
$title = Title::makeTitle( $result->namespace, $result->title );
$safeTitle = Title::makeTitleSafe( $result->namespace,
$result->title );
if ( $title instanceof Title && $safeTitle instanceof Title ) {
- $pageLink = Linker::link( $title );
+ $linkRenderer = $this->getLinkRenderer();
+ $pageLink = $linkRenderer->makeLink( $title );
if ( $safeTitle->isKnown() && wfFindFile( $safeTitle )
) {
// If the title exists and is a file, than
strike.
- // The wfFindFile() call should already be
cached from Linker::link call
+ // The wfFindFile() call should already be
cached from LinkRenderer::makeLink call
// so it shouldn't be too expensive. However a
future @todo would be
// to do preload existence checks for files all
at once via RepoGroup::findFiles.
$pageLink = Html::rawElement( 'del', array(),
$pageLink );
}
$gu = SpecialPage::getTitleFor( 'GlobalUsage',
$title->getDBKey() );
- $label = $this->msg( 'nlinks' )->numParams(
$result->value )->escaped();
- $usages = Linker::link( $gu, $label );
+ $label = $this->msg( 'nlinks' )->numParams(
$result->value )->text();
+ $usages = $linkRenderer->makeLink( $gu, $label );
return $this->getLanguage()->specialList( $pageLink,
$usages );
} else {
diff --git a/extension.json b/extension.json
index 9fc513b..39d5565 100644
--- a/extension.json
+++ b/extension.json
@@ -5,6 +5,9 @@
"url": "https://www.mediawiki.org/wiki/Extension:GlobalUsage";,
"descriptionmsg": "globalusage-desc",
"license-name": "MIT",
+ "requires": {
+ "MediaWiki": ">= 1.28.0"
+ },
"type": "specialpage",
"SpecialPages": {
"MostGloballyLinkedFiles": "MostGloballyLinkedFilesPage",
--
To view, visit https://gerrit.wikimedia.org/r/339815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d65a319d11f41c933b1348c6a52b91ec4935025
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GlobalUsage
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek <matejsuchane...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
