* (bug 918) Search index incorrectly joined words at == headings ==

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 467cc62..2b9ae8f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -201,6 +201,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * changed directory hierarchy in images/math/. System upgrades from old to
   new hierarchy on the fly.
 * (bug 3487) Fix category edit preview with preview-on-bottom
+* (bug 918) Search index incorrectly joined words at == headings ==
 
 
 === Caveats ===

diff --git a/includes/SearchUpdate.php b/includes/SearchUpdate.php
index d64d53d..3396eb9 100644 (file)
--- a/includes/SearchUpdate.php
+++ b/includes/SearchUpdate.php
@@ -54,8 +54,8 @@ class SearchUpdate {
                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( "/(^|\\n)\\s*==\\s+([^\\n]+)\\s+==\\s/sD",
-                 "\\2 \\2 \\2 ", $text ); # Emphasize headings
+               $text = preg_replace( "/(^|\\n)==\\s*([^\\n]+)\\s*==(\\s)/sD",
+                 "\\1\\2 \\2 \\2\\3", $text ); # Emphasize headings
 
                # Strip external URLs
                $uc = "A-Za-z0-9_\\/:.,~%\\-+&;#?!=()@\\xA0-\\xFF";