From b84db39863cd55166bff584265d255a0f882e64a Mon Sep 17 00:00:00 2001
From: David Lawrence <dlawrence@mozilla.com>
Date: Thu, 25 Jul 2013 14:41:32 +0800
Subject: Bug 750742: Create new BMO extension called TrackingFlags to move
 current tracking flags away from custom fields

---
 Bugzilla/Search/Quicksearch.pm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'Bugzilla/Search')

diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 48eaff8d1..c3c11b728 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -384,15 +384,18 @@ sub _handle_field_names {
 
     # Flag and requestee shortcut
     if ($or_operand =~ /^(?:flag:)?([^\?]+\?)([^\?]*)$/) {
-        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);
+        # BMO: Do not treat custom fields as flags if value is ?
+        if ($1 !~ /^cf_/) {
+            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;
         }
-        return 1;
     }
 
     # Generic field1,field2,field3:value1,value2 notation.
-- 
cgit v1.2.3-24-g4f1b