From 41f2789c933d7a7c32960c8b976d5d75de7433f2 Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Wed, 17 Feb 2010 14:03:51 -0800
Subject: 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

---
 enter_bug.cgi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'enter_bug.cgi')

diff --git a/enter_bug.cgi b/enter_bug.cgi
index 31e106959..a4ed7350e 100755
--- 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
-- 
cgit v1.2.3-24-g4f1b