MediaWiki 1.16.0

[autoinstallsdev/mediawiki.git] / includes / search / SearchUpdate.php

diff --git a/includes/SearchUpdate.php b/includes/search/SearchUpdate.php
similarity index 94%
rename from includes/SearchUpdate.php
rename to includes/search/SearchUpdate.php
index 087a8ba5dc7979b43450dca552ad4c31b802e35f..e30c70e6d17e99aea4bc9405646114ac46c58797 100644 (file)
--- a/includes/SearchUpdate.php
+++ b/includes/search/SearchUpdate.php
@@ -43,11 +43,11 @@ class SearchUpdate {
                }
 
                # Language-specific strip/conversion
-               $text = $wgContLang->stripForSearch( $this->mText );
+               $text = $wgContLang->normalizeForSearch( $this->mText );
 
                wfProfileIn( $fname.'-regexps' );
-               $text = preg_replace( "/<\\/?\\s*[A-Za-z][A-Za-z0-9]*\\s*([^>]*?)>/",
-                 ' ', strtolower( " " . $text /*$this->mText*/ . " " ) ); # Strip HTML markup
+               $text = preg_replace( "/<\\/?\\s*[A-Za-z][^>]*?>/",
+                       ' ', $wgContLang->lc( " " . $text . " " ) ); # Strip HTML markup
                $text = preg_replace( "/(^|\\n)==\\s*([^\\n]+)\\s*==(\\s)/sD",
                  "\\1\\2 \\2 \\2\\3", $text ); # Emphasize headings