From: Chad Horohoe <chadh@wikimedia.org>
Date: Fri, 5 Sep 2014 13:51:27 +0000 (-0700)
Subject: Reset searchTerms[] before populating.
X-Git-Tag: 1.31.0-rc.0~14154
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=3b7a00358976832d402ee7f5b47fdd1024ddebef;p=lhc%2Fweb%2Fwiklou.git

Reset searchTerms[] before populating.

Otherwise, multiple calls to searchQuery() would accumulate search
terms. searchTerms[] is defined in SearchEngine so we can't just get
rid of it altogether.

Change-Id: Iddbb3920e3a9d5849c99fe90d2d725d16019b51d
---

diff --git a/includes/search/SearchPostgres.php b/includes/search/SearchPostgres.php
index 914bc1c493..c64c845650 100644
--- a/includes/search/SearchPostgres.php
+++ b/includes/search/SearchPostgres.php
@@ -142,6 +142,7 @@ class SearchPostgres extends SearchDatabase {
 		$top = $res->fetchRow();
 		$top = $top[0];
 
+		$this->searchTerms = array();
 		if ( $top === "" ) { ## e.g. if only stopwords are used XXX return something better
 			$query = "SELECT page_id, page_namespace, page_title, 0 AS score " .
 				"FROM page p, revision r, pagecontent c WHERE p.page_latest = r.rev_id " .