trailing whitespace removal

[lhc/web/wiklou.git] / includes / SearchMySQL.php

diff --git a/includes/SearchMySQL.php b/includes/SearchMySQL.php
index 84571a5..857aa14 100644 (file)
--- a/includes/SearchMySQL.php
+++ b/includes/SearchMySQL.php
@@ -1,17 +1,17 @@
 <?php
 # Copyright (C) 2004 Brion Vibber <brion@pobox.com>
 # http://www.mediawiki.org/
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or 
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -27,6 +27,7 @@
 /** */
 require_once( 'SearchEngine.php' );
 
+/** @package MediaWiki */
 class SearchMySQL extends SearchEngine {
        /**
         * Perform a full text search query and return a result set.
@@ -51,8 +52,8 @@ class SearchMySQL extends SearchEngine {
                $resultSet = $this->db->resultObject( $this->db->query( $this->getQuery( $this->filter( $term ), false ) ) );
                return new MySQLSearchResultSet( $resultSet, $this->searchTerms );
        }
-       
-       
+
+
        /**
         * Return a partial WHERE clause to exclude redirects, if so set
         * @return string
@@ -60,12 +61,12 @@ class SearchMySQL extends SearchEngine {
         */
        function queryRedirect() {
                if( $this->showRedirects ) {
-                       return 'AND cur_is_redirect=0';
-               } else {
                        return '';
+               } else {
+                       return 'AND page_is_redirect=0';
                }
        }
-       
+
        /**
         * Return a partial WHERE clause to limit the search to the given namespaces
         * @return string
@@ -78,14 +79,14 @@ class SearchMySQL extends SearchEngine {
                }
                return 'AND page_namespace IN (' . $namespaces . ')';
        }
-       
+
        /**
         * Return a LIMIT clause to limit results on the query.
         * @return string
         * @access private
         */
        function queryLimit() {
-               return $this->db->limitResult( $this->limit, $this->offset );
+               return $this->db->limitResult( '', $this->limit, $this->offset );
        }
 
        /**
@@ -95,9 +96,9 @@ class SearchMySQL extends SearchEngine {
         * @access private
         */
        function queryRanking( $filteredTerm, $fulltext ) {
-               return "";
+               return '';
        }
-       
+
        /**
         * Construct the full SQL query to do the search.
         * The guts shoulds be constructed in queryMain()
@@ -171,29 +172,30 @@ class SearchMySQL extends SearchEngine {
         */
     function updateTitle( $id, $title ) {
                $dbw =& wfGetDB( DB_MASTER );
-               
-               $dbw->update( array( 'searchindex' ),
+
+               $dbw->update( 'searchindex',
                        array( 'si_title' => $title ),
                        array( 'si_page'  => $id ),
                        'SearchMySQL4::updateTitle',
-                       $dbw->lowPriorityOption() );
+                       array( $dbw->lowPriorityOption() ) );
        }
 }
 
+/** @package MediaWiki */
 class MySQLSearchResultSet extends SearchResultSet {
        function MySQLSearchResultSet( $resultSet, $terms ) {
                $this->mResultSet = $resultSet;
                $this->mTerms = $terms;
        }
-       
+
        function termMatches() {
                return $this->mTerms;
        }
-       
+
        function numRows() {
                return $this->mResultSet->numRows();
        }
-       
+
        function next() {
                $row = $this->mResultSet->fetchObject();
                if( $row === false ) {