X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fsearch%2FSearchOracle.php;h=0cbb41c4711b17e4f6d05506b0239312f3ff170d;hb=f31b45192ec1385bd9143f23f5147985a9ca6bb6;hp=6d7e9886633c78d5bd61a5f4bee56c01a75811b0;hpb=ff076e5016e2b088b8886a66a1a7075a00411e20;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/search/SearchOracle.php b/includes/search/SearchOracle.php
index 6d7e988663..0cbb41c471 100644
--- a/includes/search/SearchOracle.php
+++ b/includes/search/SearchOracle.php
@@ -24,6 +24,8 @@
  * @ingroup Search
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * Search engine hook base class for Oracle (ConText).
  * @ingroup Search
@@ -96,7 +98,7 @@ class SearchOracle extends SearchDatabase {
 		if ( is_null( $this->namespaces ) ) {
 			return '';
 		}
-		if ( !count( $this->namespaces ) ) {
+		if ( $this->namespaces === [] ) {
 			$namespaces = '0';
 		} else {
 			$namespaces = $this->db->makeList( $this->namespaces );
@@ -173,7 +175,6 @@ class SearchOracle extends SearchDatabase {
 	 * @return string
 	 */
 	private function parseQuery( $filteredText, $fulltext ) {
-		global $wgContLang;
 		$lc = $this->legalSearchChars( self::CHARS_NO_SYNTAX );
 		$this->searchTerms = [];
 
@@ -185,7 +186,8 @@ class SearchOracle extends SearchDatabase {
 			foreach ( $m as $terms ) {
 				// Search terms in all variant forms, only
 				// apply on wiki with LanguageConverter
-				$temp_terms = $wgContLang->autoConvertToAllVariants( $terms[2] );
+				$temp_terms = MediaWikiServices::getInstance()->getContentLanguage()->
+					autoConvertToAllVariants( $terms[2] );
 				if ( is_array( $temp_terms ) ) {
 					$temp_terms = array_unique( array_values( $temp_terms ) );
 					foreach ( $temp_terms as $t ) {
@@ -212,8 +214,7 @@ class SearchOracle extends SearchDatabase {
 	}
 
 	private function escapeTerm( $t ) {
-		global $wgContLang;
-		$t = $wgContLang->normalizeForSearch( $t );
+		$t = MediaWikiServices::getInstance()->getContentLanguage()->normalizeForSearch( $t );
 		$t = isset( $this->reservedWords[strtoupper( $t )] ) ? '{' . $t . '}' : $t;
 		$t = preg_replace( '/^"(.*)"$/', '($1)', $t );
 		$t = preg_replace( '/([-&|])/', '\\\\$1', $t );