Merge "mw.page.gallery: Prevent jumpiness due to viewport height changes"

[lhc/web/wiklou.git] / includes / search / SearchMssql.php

diff --git a/includes/search/SearchMssql.php b/includes/search/SearchMssql.php
index 5e8fb04..43bd3be 100644 (file)
--- a/includes/search/SearchMssql.php
+++ b/includes/search/SearchMssql.php
@@ -31,9 +31,8 @@ class SearchMssql extends SearchDatabase {
         *
         * @param string $term Raw search term
         * @return SqlSearchResultSet
-        * @access public
         */
-       function searchText( $term ) {
+       protected function doSearchText( $term ) {
                $resultSet = $this->db->query( $this->getQuery( $this->filter( $term ), true ) );
                return new SqlSearchResultSet( $resultSet, $this->searchTerms );
        }
@@ -43,9 +42,8 @@ class SearchMssql extends SearchDatabase {
         *
         * @param string $term Raw search term
         * @return SqlSearchResultSet
-        * @access public
         */
-       function searchTitle( $term ) {
+       protected function doSearchTitle( $term ) {
                $resultSet = $this->db->query( $this->getQuery( $this->filter( $term ), false ) );
                return new SqlSearchResultSet( $resultSet, $this->searchTerms );
        }
@@ -54,9 +52,8 @@ class SearchMssql extends SearchDatabase {
         * Return a partial WHERE clause to limit the search to the given namespaces
         *
         * @return string
-        * @private
         */
-       function queryNamespaces() {
+       private function queryNamespaces() {
                $namespaces = implode( ',', $this->namespaces );
                if ( $namespaces == '' ) {
                        $namespaces = '0';
@@ -71,7 +68,7 @@ class SearchMssql extends SearchDatabase {
         *
         * @return string
         */
-       function queryLimit( $sql ) {
+       private function queryLimit( $sql ) {
                return $this->db->limitResult( $sql, $this->limit, $this->offset );
        }
 
@@ -95,7 +92,7 @@ class SearchMssql 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 ) . ' ' );
@@ -117,9 +114,8 @@ class SearchMssql extends SearchDatabase {
         * @param string $filteredTerm
         * @param bool $fulltext
         * @return string
-        * @private
         */
-       function queryMain( $filteredTerm, $fulltext ) {
+       private function queryMain( $filteredTerm, $fulltext ) {
                $match = $this->parseQuery( $filteredTerm, $fulltext );
                $page = $this->db->tableName( 'page' );
                $searchindex = $this->db->tableName( 'searchindex' );
@@ -134,9 +130,9 @@ class SearchMssql 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.