Free $textMatches results only when done using it

Change-Id: Ic534fa605ca9c771e7cbe7d3d243f1062fb2d022

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index b100e49..2f47add 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -384,8 +384,6 @@ class SpecialSearch extends SpecialPage {
                                $out->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(
                                                SearchResultSet::SECONDARY_RESULTS ), $term ) );
                        }
-
-                       $textMatches->free();
                }
 
                $hasOtherResults = $textMatches &&
@@ -416,6 +414,10 @@ class SpecialSearch extends SpecialPage {
                        }
                }
 
+               if ( $textMatches ) {
+                       $textMatches->free();
+               }
+
                $out->addHTML( '<div class="visualClear"></div>' );
 
                if ( $prevnext ) {
@@ -432,6 +434,7 @@ class SpecialSearch extends SpecialPage {
         * Produce wiki header for interwiki results
         * @param string $interwiki Interwiki name
         * @param SearchResultSet $interwikiResult The result set
+        * @return string
         */
        protected function interwikiHeader( $interwiki, $interwikiResult ) {
                // TODO: we need to figure out how to name wikis correctly