(bug 12120) Unescaped quote in YAML output

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

diff --git a/includes/SearchMySQL4.php b/includes/SearchMySQL4.php
index 3e770fb..271dbe1 100644 (file)
--- a/includes/SearchMySQL4.php
+++ b/includes/SearchMySQL4.php
@@ -14,37 +14,30 @@
 #
 # 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
- */
-
-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 */
        function parseQuery( $filteredText, $fulltext ) {
                global $wgContLang;
-               $lc = SearchEngine::legalSearchChars();
+               $lc = SearchEngine::legalSearchChars(); // Minus format chars
                $searchon = '';
                $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 ) {
@@ -54,22 +47,28 @@ 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;
+                               $this->searchTerms[] = "\b$regexp\b";
                        }
                        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" );
                }
-               
+
                $searchon = $this->db->strencode( $searchon );
                $field = $this->getIndexField( $fulltext );
                return " MATCH($field) AGAINST('$searchon' IN BOOLEAN MODE) ";
        }
+
+       public static function legalSearchChars() {
+               return "\"*" . parent::legalSearchChars();
+       }
 }
-?>
+