X-Git-Url: https://git.cyclocoop.org/admin/?a=blobdiff_plain;f=includes%2Fsearch%2FSearchOracle.php;h=7fe5b53ca6aac508f6598d5d3537345c8028e332;hb=55420abd95c411b0f350dc325257b571a905e85e;hp=2e6cb84ca6a393281fefef8f122019b5cec0968b;hpb=c6d1ceb90a9684fa0da758d88ba1e994fad4cffc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/search/SearchOracle.php b/includes/search/SearchOracle.php
index 2e6cb84ca6..7fe5b53ca6 100644
--- a/includes/search/SearchOracle.php
+++ b/includes/search/SearchOracle.php
@@ -64,7 +64,7 @@ class SearchOracle extends SearchDatabase {
 	 * @param string $term Raw search term
 	 * @return SqlSearchResultSet
 	 */
-	function searchText( $term ) {
+	protected function doSearchText( $term ) {
 		if ( $term == '' ) {
 			return new SqlSearchResultSet( false, '' );
 		}
@@ -79,7 +79,7 @@ class SearchOracle extends SearchDatabase {
 	 * @param string $term Raw search term
 	 * @return SqlSearchResultSet
 	 */
-	function searchTitle( $term ) {
+	protected function doSearchTitle( $term ) {
 		if ( $term == '' ) {
 			return new SqlSearchResultSet( false, '' );
 		}
@@ -92,7 +92,7 @@ class SearchOracle extends SearchDatabase {
 	 * Return a partial WHERE clause to limit the search to the given namespaces
 	 * @return string
 	 */
-	function queryNamespaces() {
+	private function queryNamespaces() {
 		if ( is_null( $this->namespaces ) ) {
 			return '';
 		}
@@ -111,7 +111,7 @@ class SearchOracle extends SearchDatabase {
 	 *
 	 * @return string
 	 */
-	function queryLimit( $sql ) {
+	private function queryLimit( $sql ) {
 		return $this->db->limitResult( $sql, $this->limit, $this->offset );
 	}
 
@@ -134,7 +134,7 @@ class SearchOracle extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function getQuery( $filteredTerm, $fulltext ) {
+	private function getQuery( $filteredTerm, $fulltext ) {
 		return $this->queryLimit( $this->queryMain( $filteredTerm, $fulltext ) . ' ' .
 			$this->queryNamespaces() . ' ' .
 			$this->queryRanking( $filteredTerm, $fulltext ) . ' ' );
@@ -145,7 +145,7 @@ class SearchOracle extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function getIndexField( $fulltext ) {
+	private function getIndexField( $fulltext ) {
 		return $fulltext ? 'si_text' : 'si_title';
 	}
 
@@ -172,9 +172,9 @@ class SearchOracle extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function parseQuery( $filteredText, $fulltext ) {
+	private function parseQuery( $filteredText, $fulltext ) {
 		global $wgContLang;
-		$lc = $this->legalSearchChars();
+		$lc = $this->legalSearchChars( self::CHARS_NO_SYNTAX );
 		$this->searchTerms = [];
 
 		# @todo FIXME: This doesn't handle parenthetical expressions.
@@ -266,7 +266,11 @@ class SearchOracle extends SearchDatabase {
 			[] );
 	}
 
-	public function legalSearchCharsForUpdate() {
-		return "\"" . parent::legalSearchCharsForUpdate();
+	public static function legalSearchChars( $type = self::CHARS_ALL ) {
+		$searchChars = parent::legalSearchChars( $type );
+		if ( $type === self::CHARS_ALL ) {
+			$searchChars = "\"" . $searchChars;
+		}
+		return $searchChars;
 	}
 }