summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-02-20 06:35:01 +0100
committerByron Jones <glob@mozilla.com>2015-02-20 06:35:01 +0100
commit720e7d4f84a0706cbb4e41c4df8ea29373a50c27 (patch)
tree5463a20a0b5e1551dbfe3aab539ded5d88750df0
parent9ec7ae75d91fa8e883aa9e127200debb8aea097b (diff)
downloadbugzilla-720e7d4f84a0706cbb4e41c4df8ea29373a50c27.tar.gz
bugzilla-720e7d4f84a0706cbb4e41c4df8ea29373a50c27.tar.xz
Bug 1088086: Possible duplicate search doesn't return any results if you input "a->b" (for any a/b)
r=dylan,a=glob
-rw-r--r--Bugzilla/DB/Mysql.pm18
1 files changed, 11 insertions, 7 deletions
diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index ef983ce55..389cc6baa 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -184,15 +184,19 @@ sub sql_fulltext_search {
if ($text =~ /(?:^|\W)[+\-<>~"()]/ || $text =~ /[()"*](?:$|\W)/) {
$mode = 'IN BOOLEAN MODE';
- # quote un-quoted compound words
- my @words = quotewords('[\s()]+', 'delimiters', $text);
- foreach my $word (@words) {
- # match words that have non-word chars in the middle of them
- if ($word =~ /\w\W+\w/ && $word !~ m/"/) {
- $word = '"' . $word . '"';
+ my @terms = split(quotemeta(FULLTEXT_OR), $text);
+ foreach my $term (@terms) {
+ # quote un-quoted compound words
+ my @words = quotewords('[\s()]+', 'delimiters', $term);
+ foreach my $word (@words) {
+ # match words that have non-word chars in the middle of them
+ if ($word =~ /\w\W+\w/ && $word !~ m/"/) {
+ $word = '"' . $word . '"';
+ }
}
+ $term = join('', @words);
}
- $text = join('', @words);
+ $text = join(FULLTEXT_OR, @terms);
}
# quote the text for use in the MATCH AGAINST expression