* (bug 4021) Fix for MySQL wildcard search

* (bug 10699) Fix for MySQL phrase search

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e6bf677..b56dda2 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -47,6 +47,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Fixed notice when accessing special page without read permission and whitelist
   is not defined
 * (bug 9252) Fix for tidy funkiness when using editintro mode
+* (bug 4021) Fix for MySQL wildcard search
+* (bug 10699) Fix for MySQL phrase search
 
 
 === API changes in 1.12 ===

diff --git a/includes/SearchMySQL4.php b/includes/SearchMySQL4.php
index 6d2bbfe..2cd3a54 100644 (file)
--- a/includes/SearchMySQL4.php
+++ b/includes/SearchMySQL4.php
@@ -32,7 +32,7 @@ class SearchMySQL4 extends SearchMySQL {
        /** @todo document */
        function parseQuery( $filteredText, $fulltext ) {
                global $wgContLang;
-               $lc = SearchEngine::legalSearchChars();
+               $lc = SearchEngine::legalSearchChars(); // Minus format chars
                $searchon = '';
                $this->searchTerms = array();
 
@@ -47,9 +47,11 @@ class SearchMySQL4 extends SearchMySQL {
                                }
                                $searchon .= $terms[1] . $wgContLang->stripForSearch( $terms[2] );
                                if( !empty( $terms[3] ) ) {
+                                       // Match individual terms in result highlighting...
                                        $regexp = preg_quote( $terms[3], '/' );
                                        if( $terms[4] ) $regexp .= "[0-9A-Za-z_]+";
                                } else {
+                                       // Match the quoted term in result highlighting...
                                        $regexp = preg_quote( str_replace( '"', '', $terms[2] ), '/' );
                                }
                                $this->searchTerms[] = $regexp;
@@ -64,5 +66,9 @@ class SearchMySQL4 extends SearchMySQL {
                $field = $this->getIndexField( $fulltext );
                return " MATCH($field) AGAINST('$searchon' IN BOOLEAN MODE) ";
        }
+
+       public static function legalSearchChars() {
+               return "\"*" . parent::legalSearchChars();
+       }
 }