From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Sun, 1 Aug 2010 22:48:57 +0000 (-0700)
Subject: Bug 581327: The patch to allow commas in Product (etc.) names broke the
X-Git-Tag: bugzilla-4.1.1~344
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21c69e6bf1158d1277fb7e1b4fab20a594876186;p=thirdparty%2Fbugzilla.git

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)
---

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 59a358a6fb..3408c2d553 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;
 }