MediaWiki 1.11.0

[autoinstalls/mediawiki.git] / includes / SearchMySQL4.php

diff --git a/includes/SearchMySQL4.php b/includes/SearchMySQL4.php
index 256579f1c28383ca18ddf32116eb4cc5ba40a0a6..6d2bbfef0b116e461de2315e13291410f7b2f5a9 100644 (file)
--- a/includes/SearchMySQL4.php
+++ b/includes/SearchMySQL4.php
@@ -1,40 +1,32 @@
 <?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.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
 /**
  * Search engine hook for MySQL 4+
- * @package MediaWiki
- * @subpackage Search
- */
-
-require_once( 'SearchMySQL.php' );
-
-/**
- * @package MediaWiki
- * @subpackage Search
+ * @addtogroup Search
  */
 class SearchMySQL4 extends SearchMySQL {
        var $strictMatching = true;
-       
+
        /** @todo document */
-       function SearchMySQL4( &$db ) {
-               $this->db =& $db;
+       function SearchMySQL4( $db ) {
+               $this->db = $db;
        }
 
        /** @todo document */
@@ -45,6 +37,7 @@ class SearchMySQL4 extends SearchMySQL {
                $this->searchTerms = array();
 
                # FIXME: This doesn't handle parenthetical expressions.
+               $m = array();
                if( preg_match_all( '/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/',
                          $filteredText, $m, PREG_SET_ORDER ) ) {
                        foreach( $m as $terms ) {
@@ -62,14 +55,14 @@ class SearchMySQL4 extends SearchMySQL {
                                $this->searchTerms[] = $regexp;
                        }
                        wfDebug( "Would search with '$searchon'\n" );
-                       wfDebug( "Match with /\b" . implode( '\b|\b', $this->searchTerms ) . "\b/\n" );
+                       wfDebug( 'Match with /\b' . implode( '\b|\b', $this->searchTerms ) . "\b/\n" );
                } else {
                        wfDebug( "Can't understand search query '{$filteredText}'\n" );
                }
-               
+
                $searchon = $this->db->strencode( $searchon );
                $field = $this->getIndexField( $fulltext );
                return " MATCH($field) AGAINST('$searchon' IN BOOLEAN MODE) ";
        }
 }
-?>
+