From: dcausse <dcausse@wikimedia.org>
Date: Fri, 30 Sep 2016 14:41:00 +0000 (+0200)
Subject: Pass interwiki option to SearchEngine
X-Git-Tag: 1.31.0-rc.0~5262
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=179979c323aab9725fbf67cab76bca7aa8fe8a47;p=lhc%2Fweb%2Fwiklou.git

Pass interwiki option to SearchEngine

Currently interwiki result are always computed even if the client does
not request them.
Pass the option via featureData to allow SearchEngine not to run
interwiki searches when not needed.

Bug: T147003
Change-Id: I55067bc7e5d926a3e37f4d24fb8e085bd252c376
---

diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index ba60da95bb..6be51986a6 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -75,6 +75,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 		// Create search engine instance and set options
 		$search = $this->buildSearchEngine( $params );
 		$search->setFeatureData( 'rewrite', (bool)$params['enablerewrites'] );
+		$search->setFeatureData( 'interwiki', (bool)$interwiki );
 
 		$query = $search->transformSearchTerm( $query );
 		$query = $search->replacePrefixes( $query );