Bug 1617: Incorrect login message when using AuthPlugin

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

diff --git a/includes/SearchUpdate.php b/includes/SearchUpdate.php
index e50429b..57f9911 100644 (file)
--- a/includes/SearchUpdate.php
+++ b/includes/SearchUpdate.php
@@ -1,5 +1,4 @@
 <?php
-# $Id$
 /**
  * See deferred.doc
  * @package MediaWiki
@@ -39,17 +38,12 @@ class SearchUpdate {
                wfProfileIn( $fname );
 
                require_once( 'SearchEngine.php' );
-               $lc = SearchEngine::legalSearchChars() . '&#;';
-               $db =& wfGetDB( DB_MASTER );
-               $searchindex = $db->tableName( 'searchindex' );
+               $search =& SearchEngine::create();
+               $lc = $search->legalSearchChars() . '&#;';
                
                if( $this->mText == false ) {
-                       # Just update the title
-                       $lowpri = $db->lowPriorityOption();
-                       $sql = "UPDATE $lowpri $searchindex SET si_title='" .
-                         $db->strencode( Title::indexTitle( $this->mNamespace, $this->mTitle ) ) .
-                         "' WHERE si_page={$this->mId}";
-                       $db->query( $sql, "SearchUpdate::doUpdate" );
+                       $search->updateTitle($this->mId,
+                               Title::indexTitle( $this->mNamespace, $this->mTitle ));
                        wfProfileOut( $fname );
                        return;
                }
@@ -105,17 +99,16 @@ class SearchUpdate {
                # Strip wiki '' and '''
                $text = preg_replace( "/''[']*/", " ", $text );
                wfProfileOut( "$fname-regexps" );
-                $db->replace( $searchindex, array(array('si_page')),
-                  array(
-                    'si_page' => $this->mId,
-                    'si_title' => $db->strencode( Title::indexTitle( $this->mNamespace, $this->mTitle ) ),
-                    'si_text' => $db->strencode( $text )
-                  ), 'SearchUpdate::doUpdate' );
+               $search->update($this->mId, Title::indexTitle( $this->mNamespace, $this->mTitle ),
+                               $text);
                wfProfileOut( $fname );
        }
 }
 
-/* Placeholder class */
+/**
+ * Placeholder class
+ * @package MediaWiki
+ */
 class SearchUpdateMyISAM extends SearchUpdate {
        # Inherits everything
 }