aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-07-31 02:06:12 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-07-31 02:06:12 +0200
commit4de440826dd7c46625e7f7c255f0708403df77b4 (patch)
tree6cc583fcae1fde1436fd7e30ca13b83691df5638
parentc8bb9a2d37babae707a2006b8027e96d5758d940 (diff)
parentac56b71c3ede46ab839ff77a0b324ef746d90cb0 (diff)
downloadforums-4de440826dd7c46625e7f7c255f0708403df77b4.tar
forums-4de440826dd7c46625e7f7c255f0708403df77b4.tar.gz
forums-4de440826dd7c46625e7f7c255f0708403df77b4.tar.bz2
forums-4de440826dd7c46625e7f7c255f0708403df77b4.tar.xz
forums-4de440826dd7c46625e7f7c255f0708403df77b4.zip
Merge branch 'ticket/jellydoughnut/9749' into develop-olympus
* ticket/jellydoughnut/9749: [ticket/9749] Fulltext mysql unexpected behavior on entering a dash in query
-rw-r--r--phpBB/includes/search/fulltext_mysql.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index da3833754e..0be3a10e5f 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -122,7 +122,7 @@ class fulltext_mysql extends search_backend
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(' +', ' |', ' -', ' +', ' -', ' |');
$keywords = preg_replace($match, $replace, $keywords);