Revert r19877; no reason is given for it but it breaks things such as parameter subst...

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

diff --git a/includes/SearchMySQL4.php b/includes/SearchMySQL4.php
index e600096..dbd88ec 100644 (file)
--- a/includes/SearchMySQL4.php
+++ b/includes/SearchMySQL4.php
@@ -14,27 +14,23 @@
 #
 # 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
+ * @addtogroup 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 +41,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,7 +59,7 @@ 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" );
                }