From: Chad Horohoe <chadh@wikimedia.org>
Date: Mon, 5 May 2014 16:26:40 +0000 (-0700)
Subject: SpecialSearch: Get title from one we already have on hand in the context
X-Git-Tag: 1.31.0-rc.0~15863^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=cb56a850d3448edfb162261ec79ac5acdb2a217a;p=lhc%2Fweb%2Fwiklou.git

SpecialSearch: Get title from one we already have on hand in the context

Change-Id: Id7e761ad4882ec5c5f9324644eca143b727b0ad9
---

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 6eee861fff..c2b5f9bdaf 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -259,8 +259,6 @@ class SpecialSearch extends SpecialPage {
 
 		// did you mean... suggestions
 		if ( $showSuggestion && $textMatches && !$textStatus && $textMatches->hasSuggestion() ) {
-			$st = SpecialPage::getTitleFor( 'Search' );
-
 			# mirror Go/Search behavior of original request ..
 			$didYouMeanParams = array( 'search' => $textMatches->getSuggestionQuery() );
 
@@ -280,7 +278,7 @@ class SpecialSearch extends SpecialPage {
 			}
 
 			$suggestLink = Linker::linkKnown(
-				$st,
+				$this->getPageTitle(),
 				$suggestionSnippet,
 				array(),
 				$stParams
@@ -651,7 +649,6 @@ class SpecialSearch extends SpecialPage {
 		// link to related articles if supported
 		$related = '';
 		if ( $result->hasRelated() ) {
-			$st = SpecialPage::getTitleFor( 'Search' );
 			$stParams = array_merge(
 				$this->powerSearchOptions(),
 				array(
@@ -662,7 +659,7 @@ class SpecialSearch extends SpecialPage {
 			);
 
 			$related = ' -- ' . Linker::linkKnown(
-				$st,
+				$this->getPageTitle(),
 				$this->msg( 'search-relatedarticle' )->text(),
 				array(),
 				$stParams