Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/292074
Change subject: SpecialListredirects: Use LinkRenderer instead of Linker::link()
......................................................................
SpecialListredirects: Use LinkRenderer instead of Linker::link()
And avoid passing null to LinKBatch::addObj() while we're at it.
Change-Id: I57abaa7c640eb97a3b17be99c8ab898fafb82634
---
M includes/specials/SpecialListredirects.php
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/74/292074/1
diff --git a/includes/specials/SpecialListredirects.php
b/includes/specials/SpecialListredirects.php
index ace6d02..9b90753 100644
--- a/includes/specials/SpecialListredirects.php
+++ b/includes/specials/SpecialListredirects.php
@@ -23,6 +23,7 @@
* @ingroup SpecialPage
* @author Rob Church <robc...@gmail.com>
*/
+use MediaWiki\MediaWikiServices;
/**
* Special:Listredirects - Lists all the redirects on the wiki.
@@ -83,7 +84,10 @@
$batch = new LinkBatch;
foreach ( $res as $row ) {
$batch->add( $row->namespace, $row->title );
- $batch->addObj( $this->getRedirectTarget( $row ) );
+ $redirTarget = $this->getRedirectTarget( $row );
+ if ( $redirTarget ) {
+ $batch->addObj( $redirTarget );
+ }
}
$batch->execute();
@@ -91,6 +95,10 @@
$res->seek( 0 );
}
+ /**
+ * @param stdClass $row
+ * @return Title|null
+ */
protected function getRedirectTarget( $row ) {
if ( isset( $row->rd_title ) ) {
return Title::makeTitle( $row->rd_namespace,
@@ -111,9 +119,10 @@
* @return string
*/
function formatResult( $skin, $result ) {
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
# Make a link to the redirect itself
$rd_title = Title::makeTitle( $result->namespace,
$result->title );
- $rd_link = Linker::link(
+ $rd_link = $linkRenderer->makeLink(
$rd_title,
null,
[],
@@ -126,7 +135,7 @@
# Make a link to the destination page
$lang = $this->getLanguage();
$arr = $lang->getArrow() . $lang->getDirMark();
- $targetLink = Linker::link( $target );
+ $targetLink = $linkRenderer->makeLink( $target );
return "$rd_link $arr $targetLink";
} else {
--
To view, visit https://gerrit.wikimedia.org/r/292074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57abaa7c640eb97a3b17be99c8ab898fafb82634
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
