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

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 596732d..b100e49 100644 (file)
--- 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 ) {