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, 4 deletions

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 3ace277dd..da9e9a6b3 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1986,10 +1986,10 @@ sub get_new_status_and_resolution {
         # Leaving the status unchanged doesn't need more investigation.
         return ($self->bug_status, $self->resolution, $self->everconfirmed);
     }
-    elsif ($action eq 'duplicate') {
-        # Only alter the bug status if the bug is currently open.
-        $status = is_open_state($self->bug_status) ? 'RESOLVED' : $self->bug_status;
-        $resolution = 'DUPLICATE';
+    elsif ($action eq 'duplicate' || $action eq 'move') {
+        # Always change the bug status, even if the bug was already "closed".
+        $status = Bugzilla->params->{'duplicate_or_move_bug_status'};
+        $resolution = ($action eq 'duplicate') ? 'DUPLICATE' : 'MOVED';
     }
     elsif ($action eq 'change_resolution') {
         $status = $self->bug_status;