[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-128-gbd8fd37

[? sunnavy]

The branch, 3.9-trunk has been updated
       via  bd8fd37912c29e80890cdc1da0d0e852a577313e (commit)
      from  7ee3ab7c80f7552663c7e149607a56d4c7e4fe74 (commit)

Summary of changes:
 lib/RT/Ticket_Overlay.pm |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit bd8fd37912c29e80890cdc1da0d0e852a577313e
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Oct 7 21:39:00 2010 +0800

    we may don't have resolved status

diff --git a/lib/RT/Ticket_Overlay.pm b/lib/RT/Ticket_Overlay.pm
index 36c6424..3f97c8e 100755
--- a/lib/RT/Ticket_Overlay.pm
+++ b/lib/RT/Ticket_Overlay.pm
@@ -2637,10 +2637,13 @@ sub _MergeInto {
     }
 
 
-    if ( $self->__Value('Status') ne 'resolved' ) {
-
+    if ( !$self->QueueObj->IsInactiveStatus($self->__Value('Status')) ) {
+        my $inactive =
+          $self->QueueObj->IsInactiveStatus('resolved')
+          ? 'resolved'
+          : ( $self->QueueObj->InactiveStatusArray )[0];
         my ( $status_val, $status_msg )
-            = $self->__Set( Field => 'Status', Value => 'resolved' );
+            = $self->__Set( Field => 'Status', Value => $inactive );
 
         unless ($status_val) {
             $RT::Handle->Rollback();

-----------------------------------------------------------------------