Bug 385415: Bugs marked as duplicate or moved to another installation always go to the RESOLVED state, even if the workflow has RESOLVED excluded from it (or if this bug status has been removed or renamed). Some major problems related to the workflow when upgrading or installing 3.1 are also fixed here - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat

1 files changed, 4 insertions, 1 deletions

diff --git a/editworkflow.cgi b/editworkflow.cgi
index ac914f76d..6aaed345e 100644
--- a/editworkflow.cgi
+++ b/editworkflow.cgi
@@ -100,7 +100,10 @@ elsif ($action eq 'update') {
         foreach my $new (@$statuses) {
             next if $old->id == $new->id;
 
-            if ($cgi->param('w_' . $old->id . '_' . $new->id)) {
+            # All transitions to 'duplicate_or_move_bug_status' must be valid.
+            if ($cgi->param('w_' . $old->id . '_' . $new->id)
+                || ($new->name eq Bugzilla->params->{'duplicate_or_move_bug_status'}))
+            {
                 $sth_insert->execute($old->id, $new->id)
                   unless defined $workflow->{$old->id}->{$new->id};
             }