From 21c69e6bf1158d1277fb7e1b4fab20a594876186 Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Sun, 1 Aug 2010 15:48:57 -0700
Subject: Bug 581327: The patch to allow commas in Product (etc.) names broke
 the entering of comma-separated values in other search fields, like bug_id.
 So now we split on commas in text fields, but not for <select> fields.
 r=mkanat, a=mkanat (module owner)

---
 Bugzilla/Search.pm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'Bugzilla/Search.pm')

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 59a358a6f..3408c2d55 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -1210,7 +1210,21 @@ sub _parse_basic_fields {
         next if !@values;
         my $operator = $params->{"${param_name}_type"} || 'anyexact';
         $operator = 'matches' if $operator eq 'content';
-        push(@charts, [$field_name, $operator, \@values]);
+        # Fields that are displayed as multi-selects are passed as arrays,
+        # so that they can properly search values that contain commas.
+        # However, other fields are sent as strings, so that they are properly
+        # split on commas if required.
+        my $field = $chart_fields->{$field_name};
+        my $pass_value;
+        if ($field->is_select or $field->name eq 'version'
+            or $field->name eq 'target_milestone')
+        {
+            $pass_value = \@values;
+        }
+        else {
+            $pass_value = join(',', @values);
+        }
+        push(@charts, [$field_name, $operator, $pass_value]);
     }
     return @charts;
 }
-- 
cgit v1.2.3-24-g4f1b