From: Erik Bernhardson <ebernhardson@wikimedia.org>
Date: Thu, 30 Jun 2016 22:55:20 +0000 (-0700)
Subject: Repair interwiki search via api
X-Git-Tag: 1.31.0-rc.0~6472
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22upgrade%22%2C%22reinstall=non%22%29%20.%20%22?a=commitdiff_plain;h=5a25b01376a4d8b43cb856c2eafd24d5b1865e12;p=lhc%2Fweb%2Fwiklou.git

Repair interwiki search via api

This was throwing exceptions, probably for many months now, when
requesting and finding interwiki search results. Probably this went
unnoticed due to interwiki search only being enabled on itwiki, and
the requirement to pass a special parameter to turn it on.

Change-Id: I68ec35bb072b5ad62dd66789936bc2ae47d5256f
---

diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index f84f806b1f..4377831ba5 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -232,15 +232,14 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 		$totalhits = null;
 		if ( $interwiki && $resultPageSet === null && $matches->hasInterwikiResults() ) {
 			foreach ( $matches->getInterwikiResults() as $interwikiMatches ) {
-				$currentMatches = $interwikiMatches->getInterwikiResults();
 				$hasInterwikiResults = true;
 
 				// Include number of results if requested
 				if ( $resultPageSet === null && isset( $searchInfo['totalhits'] ) ) {
-					$totalhits += $currentMatches->getTotalHits();
+					$totalhits += $interwikiMatches->getTotalHits();
 				}
 
-				$result = $currentMatches->next();
+				$result = $interwikiMatches->next();
 				while ( $result ) {
 					$title = $result->getTitle();
 
@@ -267,7 +266,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 						$titles[] = $title;
 					}
 
-					$result = $currentMatches->next();
+					$result = $interwikiMatches->next();
 				}
 			}
 			if ( $totalhits !== null ) {