From ecadaeed4aca32dcc2a2d3bd61d9b5a1f741cc73 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Tue, 31 May 2016 20:36:10 -0700
Subject: [PATCH] SpecialListredirects: Use LinkRenderer instead of
 Linker::link()

And avoid passing null to LinkBatch::addObj() while we're at it.

Change-Id: I57abaa7c640eb97a3b17be99c8ab898fafb82634
---
 includes/specials/SpecialListredirects.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/includes/specials/SpecialListredirects.php b/includes/specials/SpecialListredirects.php
index ace6d02cb2..d034a6ca77 100644
--- a/includes/specials/SpecialListredirects.php
+++ b/includes/specials/SpecialListredirects.php
@@ -83,7 +83,10 @@ class ListredirectsPage extends QueryPage {
 		$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 +94,10 @@ class ListredirectsPage extends QueryPage {
 		$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 +118,10 @@ class ListredirectsPage extends QueryPage {
 	 * @return string
 	 */
 	function formatResult( $skin, $result ) {
+		$linkRenderer = $this->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 +134,7 @@ class ListredirectsPage extends QueryPage {
 			# 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 {
-- 
2.20.1