Bug 538211: Make value-controlled and visibility-controlled fields behave

correctly on enter_bug.cgi when the user uses a bookmarkable template to
pre-fill values in the controller.
r=LpSolit, a=LpSolit

diff --git a/enter_bug.cgi b/enter_bug.cgi
index 31e106959f5b0f0142018cabac5d3b93906fb646..a4ed7350efe067ef9633c9628430a892f66df7d8 100755 (executable)
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -395,7 +395,14 @@ $vars->{'token'}             = issue_session_token('createbug:');
 
 my @enter_bug_fields = grep { $_->enter_bug } Bugzilla->active_custom_fields;
 foreach my $field (@enter_bug_fields) {
-    $vars->{$field->name} = formvalue($field->name);
+    my $cf_name = $field->name;
+    my $cf_value = $cgi->param($cf_name);
+    if (defined $cf_value) {
+        if ($field->type == FIELD_TYPE_MULTI_SELECT) {
+            $cf_value = [$cgi->param($cf_name)];
+        }
+        $default{$cf_name} = $vars->{$cf_name} = $cf_value;
+    }
 }
 
 # This allows the Field visibility and value controls to work with the