From 843b806803f65237502d3237d89d3782f38835e8 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 4 Aug 2016 16:04:06 -0700
Subject: [PATCH] SpecialEditWatchlist: Use LinkRenderer instead of
 Linker::link()

Change-Id: Ib75078f14005940b5c625932d1bbb8c17299c448
---
 includes/specials/SpecialEditWatchlist.php | 53 ++++++++++++++--------
 includes/specials/SpecialWatchlist.php     |  5 +-
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index 627dd2cfa9..a5a45d5927 100644
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -2,7 +2,6 @@
 /**
  * @defgroup Watchlist Users watchlist handling
  */
-use MediaWiki\Linker\LinkTarget;
 
 /**
  * Implements Special:EditWatchlist
@@ -27,6 +26,8 @@ use MediaWiki\Linker\LinkTarget;
  * @ingroup Watchlist
  */
 
+use MediaWiki\Linker\LinkRenderer;
+use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
 
 /**
@@ -138,7 +139,13 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	protected function outputSubtitle() {
 		$out = $this->getOutput();
 		$out->addSubtitle( $this->msg( 'watchlistfor2', $this->getUser()->getName() )
-			->rawParams( SpecialEditWatchlist::buildTools( null ) ) );
+			->rawParams(
+				self::buildTools(
+					$this->getLanguage(),
+					$this->getLinkRenderer()
+				)
+			)
+		);
 	}
 
 	/**
@@ -277,7 +284,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	 * @param string $output
 	 */
 	private function showTitles( $titles, &$output ) {
-		$talk = $this->msg( 'talkpagelinktext' )->escaped();
+		$talk = $this->msg( 'talkpagelinktext' )->text();
 		// Do a batch existence check
 		$batch = new LinkBatch();
 		if ( count( $titles ) >= 100 ) {
@@ -300,6 +307,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 		// Print out the list
 		$output .= "<ul>\n";
 
+		$linkRenderer = $this->getLinkRenderer();
 		foreach ( $titles as $title ) {
 			if ( !$title instanceof Title ) {
 				$title = Title::newFromText( $title );
@@ -307,9 +315,9 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 
 			if ( $title instanceof Title ) {
 				$output .= '<li>' .
-					Linker::link( $title ) . ' ' .
+					$linkRenderer->makeLink( $title ) . ' ' .
 					$this->msg( 'parentheses' )->rawParams(
-						Linker::link( $title->getTalkPage(), $talk )
+						$linkRenderer->makeLink( $title->getTalkPage(), $talk )
 					)->escaped() .
 					"</li>\n";
 			}
@@ -610,26 +618,27 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	 * @return string
 	 */
 	private function buildRemoveLine( $title ) {
-		$link = Linker::link( $title );
+		$linkRenderer = $this->getLinkRenderer();
+		$link = $linkRenderer->makeLink( $title );
 
-		$tools['talk'] = Linker::link(
+		$tools['talk'] = $linkRenderer->makeLink(
 			$title->getTalkPage(),
-			$this->msg( 'talkpagelinktext' )->escaped()
+			$this->msg( 'talkpagelinktext' )->text()
 		);
 
 		if ( $title->exists() ) {
-			$tools['history'] = Linker::linkKnown(
+			$tools['history'] = $linkRenderer->makeKnownLink(
 				$title,
-				$this->msg( 'history_short' )->escaped(),
+				$this->msg( 'history_short' )->text(),
 				[],
 				[ 'action' => 'history' ]
 			);
 		}
 
 		if ( $title->getNamespace() == NS_USER && !$title->isSubpage() ) {
-			$tools['contributions'] = Linker::linkKnown(
+			$tools['contributions'] = $linkRenderer->makeKnownLink(
 				SpecialPage::getTitleFor( 'Contributions', $title->getText() ),
-				$this->msg( 'contributions' )->escaped()
+				$this->msg( 'contributions' )->text()
 			);
 		}
 
@@ -724,11 +733,19 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	 * Build a set of links for convenient navigation
 	 * between watchlist viewing and editing modes
 	 *
-	 * @param null $unused
+	 * @param Language $lang
+	 * @param LinkRenderer|null $linkRenderer
 	 * @return string
 	 */
-	public static function buildTools( $unused ) {
-		global $wgLang;
+	public static function buildTools( $lang, LinkRenderer $linkRenderer = null ) {
+		if ( !$lang instanceof Language ) {
+			// back-compat where the first parameter was $unused
+			global $wgLang;
+			$lang = $wgLang;
+		}
+		if ( !$linkRenderer ) {
+			$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+		}
 
 		$tools = [];
 		$modes = [
@@ -740,16 +757,16 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 
 		foreach ( $modes as $mode => $arr ) {
 			// can use messages 'watchlisttools-view', 'watchlisttools-edit', 'watchlisttools-raw'
-			$tools[] = Linker::linkKnown(
+			$tools[] = $linkRenderer->makeKnownLink(
 				SpecialPage::getTitleFor( $arr[0], $arr[1] ),
-				wfMessage( "watchlisttools-{$mode}" )->escaped()
+				wfMessage( "watchlisttools-{$mode}" )->text()
 			);
 		}
 
 		return Html::rawElement(
 			'span',
 			[ 'class' => 'mw-watchlist-toollinks' ],
-			wfMessage( 'parentheses' )->rawParams( $wgLang->pipeList( $tools ) )->escaped()
+			wfMessage( 'parentheses' )->rawParams( $lang->pipeList( $tools ) )->escaped()
 		);
 	}
 }
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 58cde7e55a..17d77ba2b8 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -429,7 +429,10 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 
 		$out->addSubtitle(
 			$this->msg( 'watchlistfor2', $user->getName() )
-				->rawParams( SpecialEditWatchlist::buildTools( null ) )
+				->rawParams( SpecialEditWatchlist::buildTools(
+					$this->getLanguage(),
+					$this->getLinkRenderer()
+				) )
 		);
 
 		$this->setTopText( $opts );
-- 
2.20.1