Merge branch 'ticket/jellydoughnut/9749' into develop-olympus

* ticket/jellydoughnut/9749:
  [ticket/9749] Fulltext mysql unexpected behavior on entering a dash in query
This commit is contained in:
Andreas Fischer 2010-07-31 02:06:12 +02:00
commit 4de440826d

View file

@ -122,7 +122,7 @@ class fulltext_mysql extends search_backend
if ($terms == 'all') if ($terms == 'all')
{ {
$match = array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#\+#', '#-#', '#\|#'); $match = array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#(^|\s)\+#', '#(^|\s)-#', '#(^|\s)\|#');
$replace = array(' +', ' |', ' -', ' +', ' -', ' |'); $replace = array(' +', ' |', ' -', ' +', ' -', ' |');
$keywords = preg_replace($match, $replace, $keywords); $keywords = preg_replace($match, $replace, $keywords);