Bug 889650: Fix crash when searching "match all of the same field" on Flags (#237)

r=mrenvoize

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 53ece5113b3cb8ecf94a09c10ec3baea9ef21e66..8cddf76bbd9a548e18b7256ea8dc8277922734b9 100644 (file)
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -2900,7 +2900,7 @@ sub _flagtypes_nonchanged {
   # don't call build_subselect as this must run as a true sub-select
   $args->{term} = "EXISTS (
         SELECT 1
-          FROM $bugs_table bugs_$chart_id
+          FROM bugs bugs_$chart_id
           LEFT JOIN attachments AS attachments_$chart_id
                     ON bugs_$chart_id.bug_id = attachments_$chart_id.bug_id
           LEFT JOIN flags AS flags_$chart_id

diff --git a/xt/lib/Bugzilla/Test/Search/Constants.pm b/xt/lib/Bugzilla/Test/Search/Constants.pm
index fe5b0a7b727d93c245664b51ab9c8d9b2d6ea873..7760ba432d289bf45ea2d21185e66acf17bd2119 100644 (file)
--- a/xt/lib/Bugzilla/Test/Search/Constants.pm
+++ b/xt/lib/Bugzilla/Test/Search/Constants.pm
@@ -1244,6 +1244,16 @@ use constant CUSTOM_SEARCH_TESTS => (
     ]
   },
 
+  {
+    name       => 'flagtypes.name = <1> AND flagtypes.name = <1>',
+    contains   => [1],
+    top_params => {j_top => 'AND_G'},
+    params     => [
+      {f => 'flagtypes.name', o => 'equals', v => '<1>'},
+      {f => 'flagtypes.name', o => 'equals', v => '<1>'},
+    ]
+  },
+
 );
 
 1;