From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 29 Oct 2015 20:41:00 +0000 (+0000)
Subject: Merge "[search] Fix method call on null value"
X-Git-Tag: 1.31.0-rc.0~9177
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=281f185ede65c09ccb273bfc4f37302106f531a4;hp=c497442971690b718e53d16f6c319094132efbaa;p=lhc%2Fweb%2Fwiklou.git

Merge "[search] Fix method call on null value"
---

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 596732de1b..b100e49c4a 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -388,7 +388,8 @@ class SpecialSearch extends SpecialPage {
 			$textMatches->free();
 		}
 
-		$hasOtherResults = $textMatches->hasInterwikiResults( SearchResultSet::INLINE_RESULTS );
+		$hasOtherResults = $textMatches &&
+			$textMatches->hasInterwikiResults( SearchResultSet::INLINE_RESULTS );
 
 		if ( $num === 0 ) {
 			if ( $textStatus ) {