Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249894
Change subject: Free $textMatches results only when done using it
......................................................................
Free $textMatches results only when done using it
Change-Id: Ic534fa605ca9c771e7cbe7d3d243f1062fb2d022
---
M includes/specials/SpecialSearch.php
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/94/249894/1
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index b100e49..2f47add 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -384,8 +384,6 @@
$out->addHTML( $this->showInterwiki(
$textMatches->getInterwikiResults(
SearchResultSet::SECONDARY_RESULTS ), $term ) );
}
-
- $textMatches->free();
}
$hasOtherResults = $textMatches &&
@@ -416,6 +414,10 @@
}
}
+ if ( $textMatches ) {
+ $textMatches->free();
+ }
+
$out->addHTML( '<div class="visualClear"></div>' );
if ( $prevnext ) {
@@ -432,6 +434,7 @@
* 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
--
To view, visit https://gerrit.wikimedia.org/r/249894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic534fa605ca9c771e7cbe7d3d243f1062fb2d022
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
