X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialListredirects.php;h=b2d6a33291100aefc75d29ed8b6c335a49daf302;hb=d46d8bb58d4edfc4a4ed144d39c9a054516a5514;hp=ace6d02cb206568a840a225079ac7a85f26c60cd;hpb=96906168cac0e9a7748511b48c369cf22c8406d5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialListredirects.php b/includes/specials/SpecialListredirects.php
index ace6d02cb2..b2d6a33291 100644
--- a/includes/specials/SpecialListredirects.php
+++ b/includes/specials/SpecialListredirects.php
@@ -24,6 +24,8 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
+use Wikimedia\Rdbms\ResultWrapper;
+
 /**
  * Special:Listredirects - Lists all the redirects on the wiki.
  * @ingroup SpecialPage
@@ -83,7 +85,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 +96,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 +120,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 +136,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 {