From 92129e7250e8fd9af8330de686ad5f77b6b73932 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Thu, 24 Jan 2008 03:49:31 +0000
Subject: Bug 391669: Modifying a bug via email_in.pl fails because there are
 many fields that process_bug.cgi requires but aren't provided to it - Patch
 by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=LpSolit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 process_bug.cgi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'process_bug.cgi')

diff --git a/process_bug.cgi b/process_bug.cgi
index 3f2235422..912440ce2 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -488,12 +488,14 @@ if (!$cgi->param('id') && $cgi->param('dup_id')) {
 foreach my $b (@bug_objects) {
     if (should_set('knob')) {
         # First, get the correct resolution <select>, in case there is more
-        # than one open -> closed transition allowed.
+        # than one open -> closed transition allowed. Allow to fallback to
+        # 'resolution' (useful when called from email_in.pl).
         my $knob = $cgi->param('knob');
         my $status = new Bugzilla::Status({name => $knob});
         my $resolution;
         if ($status) {
-            $resolution = $cgi->param('resolution_knob_' . $status->id);
+            $resolution = $cgi->param('resolution_knob_' . $status->id)
+                          || $cgi->param('resolution');
         }
         else {
             $resolution = $cgi->param('resolution_knob_change_resolution');
-- 
cgit v1.2.3-24-g4f1b