From: Chad Horohoe <chadh@wikimedia.org>
Date: Mon, 5 May 2014 20:33:22 +0000 (-0700)
Subject: Don't call legalSearchChars() statically so it can properly inherit
X-Git-Tag: 1.31.0-rc.0~15875^2
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=b826ba0bf31030ef4fef77a92d4070a1107cf245;p=lhc%2Fweb%2Fwiklou.git

Don't call legalSearchChars() statically so it can properly inherit

Change-Id: Iaabc10ce2905eefe9de8bceeec3290082ba9eb2e
---

diff --git a/includes/search/SearchMssql.php b/includes/search/SearchMssql.php
index 3eef498768..ed76ff8c64 100644
--- a/includes/search/SearchMssql.php
+++ b/includes/search/SearchMssql.php
@@ -132,7 +132,7 @@ class SearchMssql extends SearchDatabase {
 	 */
 	function parseQuery( $filteredText, $fulltext ) {
 		global $wgContLang;
-		$lc = SearchEngine::legalSearchChars();
+		$lc = $this->legalSearchChars();
 		$this->searchTerms = array();
 
 		# @todo FIXME: This doesn't handle parenthetical expressions.
diff --git a/includes/search/SearchMySQL.php b/includes/search/SearchMySQL.php
index 345ced551b..cc20d027ef 100644
--- a/includes/search/SearchMySQL.php
+++ b/includes/search/SearchMySQL.php
@@ -43,7 +43,7 @@ class SearchMySQL extends SearchDatabase {
 	 */
 	function parseQuery( $filteredText, $fulltext ) {
 		global $wgContLang;
-		$lc = SearchEngine::legalSearchChars(); // Minus format chars
+		$lc = $this->legalSearchChars(); // Minus format chars
 		$searchon = '';
 		$this->searchTerms = array();
 
diff --git a/includes/search/SearchOracle.php b/includes/search/SearchOracle.php
index 93427d196f..c944152199 100644
--- a/includes/search/SearchOracle.php
+++ b/includes/search/SearchOracle.php
@@ -171,7 +171,7 @@ class SearchOracle extends SearchDatabase {
 	 */
 	function parseQuery( $filteredText, $fulltext ) {
 		global $wgContLang;
-		$lc = SearchEngine::legalSearchChars();
+		$lc = $this->legalSearchChars();
 		$this->searchTerms = array();
 
 		# @todo FIXME: This doesn't handle parenthetical expressions.
diff --git a/includes/search/SearchSqlite.php b/includes/search/SearchSqlite.php
index 1ac4946a9c..6b1a6b24bc 100644
--- a/includes/search/SearchSqlite.php
+++ b/includes/search/SearchSqlite.php
@@ -42,7 +42,7 @@ class SearchSqlite extends SearchDatabase {
 	 */
 	function parseQuery( $filteredText, $fulltext ) {
 		global $wgContLang;
-		$lc = SearchEngine::legalSearchChars(); // Minus format chars
+		$lc = $this->legalSearchChars(); // Minus format chars
 		$searchon = '';
 		$this->searchTerms = array();