diff options
author | Byron Jones <bjones@mozilla.com> | 2013-05-21 07:59:34 +0200 |
---|---|---|
committer | Byron Jones <bjones@mozilla.com> | 2013-05-21 07:59:34 +0200 |
commit | a2062da6482fa958a58a7891fc528376c3618be1 (patch) | |
tree | 4471c05fc32f302ff6006be599048a2957982ddd /Bugzilla/Search/Quicksearch.pm | |
parent | 09a62c23f05df3caacd2745d276b846a326be904 (diff) | |
parent | 0b1e410c81430711a602adc56e4fc7667d1c841e (diff) | |
download | bugzilla-a2062da6482fa958a58a7891fc528376c3618be1.tar.gz bugzilla-a2062da6482fa958a58a7891fc528376c3618be1.tar.xz |
merge with bugzilla/4.2
Diffstat (limited to 'Bugzilla/Search/Quicksearch.pm')
-rw-r--r-- | Bugzilla/Search/Quicksearch.pm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm index 1fca2e322..61e4a926a 100644 --- a/Bugzilla/Search/Quicksearch.pm +++ b/Bugzilla/Search/Quicksearch.pm @@ -382,9 +382,14 @@ sub _handle_field_names { # Flag and requestee shortcut if ($or_operand =~ /^(?:flag:)?([^\?]+\?)([^\?]*)$/) { - addChart('flagtypes.name', 'substring', $1, $negate); - $chart++; $and = $or = 0; # Next chart for boolean AND - addChart('requestees.login_name', 'substring', $2, $negate); + my ($flagtype, $requestee) = ($1, $2); + addChart('flagtypes.name', 'substring', $flagtype, $negate); + if ($requestee) { + # AND + $chart++; + $and = $or = 0; + addChart('requestees.login_name', 'substring', $requestee, $negate); + } return 1; } |