From d1cad79f52bddc3d5691e532b849b43f7a454f6a Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 29 Oct 2015 14:41:00 -0700 Subject: [PATCH] Free $textMatches results only when done using it Change-Id: Ic534fa605ca9c771e7cbe7d3d243f1062fb2d022 --- includes/specials/SpecialSearch.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index b100e49c4a..2f47add185 100644 --- 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( '
' ); 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 -- 2.20.1