From 3eea79ef6738f7961258ce81885746f44e97383f Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Mon, 23 May 2016 19:16:55 -0700
Subject: [PATCH] SpecialLinkSearch: Use LinkRenderer instead of
 MediaWikiPageLinkRenderer

Change-Id: Ib117e4db841327c302f9ceaa97aaa52b6391b093
---
 includes/specials/SpecialLinkSearch.php | 35 +------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php
index 1ecbee007e..d4886f026b 100644
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -30,11 +30,6 @@ class LinkSearchPage extends QueryPage {
 	/** @var array|bool */
 	private $mungedQuery = false;
 
-	/**
-	 * @var PageLinkRenderer
-	 */
-	protected $linkRenderer = null;
-
 	function setParams( $params ) {
 		$this->mQuery = $params['query'];
 		$this->mNs = $params['namespace'];
@@ -49,39 +44,11 @@ class LinkSearchPage extends QueryPage {
 		// using the setServices() method.
 	}
 
-	/**
-	 * Initialize or override the PageLinkRenderer LinkSearchPage collaborates with.
-	 * Useful mainly for testing.
-	 *
-	 * @todo query logic and rendering logic should be split and also injected
-	 *
-	 * @param PageLinkRenderer $linkRenderer
-	 */
-	public function setPageLinkRenderer(
-		PageLinkRenderer $linkRenderer
-	) {
-		$this->linkRenderer = $linkRenderer;
-	}
-
-	/**
-	 * Initialize any services we'll need (unless it has already been provided via a setter).
-	 * This allows for dependency injection even though we don't control object creation.
-	 */
-	private function initServices() {
-		global $wgContLang;
-		if ( !$this->linkRenderer ) {
-			$titleFormatter = new MediaWikiTitleCodec( $wgContLang, GenderCache::singleton() );
-			$this->linkRenderer = new MediaWikiPageLinkRenderer( $titleFormatter );
-		}
-	}
-
 	function isCacheable() {
 		return false;
 	}
 
 	public function execute( $par ) {
-		$this->initServices();
-
 		$this->setHeaders();
 		$this->outputHeader();
 
@@ -277,7 +244,7 @@ class LinkSearchPage extends QueryPage {
 	 */
 	function formatResult( $skin, $result ) {
 		$title = new TitleValue( (int)$result->namespace, $result->title );
-		$pageLink = $this->linkRenderer->renderHtmlLink( $title );
+		$pageLink = $this->getLinkRenderer()->makeLink( $title );
 
 		$url = $result->url;
 		$urlLink = Linker::makeExternalLink( $url, $url );
-- 
2.20.1