1 files changed, 13 insertions, 6 deletions

diff --git a/post_bug.cgi b/post_bug.cgi
index 2fa6576f2..b3f668e3f 100755
--- a/post_bug.cgi
+++ b/post_bug.cgi
@@ -202,17 +202,24 @@ if (Bugzilla->params->{"useqacontact"}) {
     }
 }
 
+# Check the bug status.
+# This order is important, see below.
+my @valid_statuses = ('UNCONFIRMED', 'NEW', 'ASSIGNED');
+
 my $bug_status = 'UNCONFIRMED';
-if ($product->votes_to_confirm) {
+if ($user->in_group('editbugs') || $user->in_group('canconfirm')) {
     # Default to NEW if the user with privs hasn't selected another status.
-    if (UserInGroup('editbugs') || UserInGroup('canconfirm')) {
-        $bug_status = scalar($cgi->param('bug_status')) || 'NEW';
-    }
-} else {
+    $bug_status = scalar($cgi->param('bug_status')) || 'NEW';
+}
+elsif (!$product->votes_to_confirm) {
     $bug_status = 'NEW';
 }
 $cgi->param(-name => 'bug_status', -value => $bug_status);
 
+# Reject 'UNCONFIRMED' as a valid status if the product
+# doesn't require votes to confirm its bugs.
+shift @valid_statuses if !$product->votes_to_confirm;
+
 if (!defined $cgi->param('target_milestone')) {
     $cgi->param(-name => 'target_milestone', -value => $product->default_milestone);
 }
@@ -226,7 +233,7 @@ check_field('rep_platform', scalar $cgi->param('rep_platform'));
 check_field('bug_severity', scalar $cgi->param('bug_severity'));
 check_field('priority',     scalar $cgi->param('priority'));
 check_field('op_sys',       scalar $cgi->param('op_sys'));
-check_field('bug_status',   scalar $cgi->param('bug_status'), ['UNCONFIRMED', 'NEW']);
+check_field('bug_status',   scalar $cgi->param('bug_status'), \@valid_statuses);
 check_field('version',      scalar $cgi->param('version'),
             [map($_->name, @{$product->versions})]);
 check_field('target_milestone', scalar $cgi->param('target_milestone'),