From dd3008b963344eea451d03094dfe8058db79bd77 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Sat, 17 Aug 2013 17:06:47 -0700
Subject: fix upgrade bug that was causing tickets to spontaneously resolve,
 #23309

---
 rt/lib/RT/Interface/Web_Vendor.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'rt/lib/RT/Interface')

diff --git a/rt/lib/RT/Interface/Web_Vendor.pm b/rt/lib/RT/Interface/Web_Vendor.pm
index 023dede8f..0c061e2de 100644
--- a/rt/lib/RT/Interface/Web_Vendor.pm
+++ b/rt/lib/RT/Interface/Web_Vendor.pm
@@ -264,10 +264,11 @@ sub ProcessTicketBasics {
       my $DateObj = RT::Date->new($session{'CurrentUser'});
       if ( $to_date ) {
           $DateObj->Set(Format => 'unknown', Value => $to_date);
-      } else {
+          $ARGSRef->{'WillResolve'} = $DateObj->ISO;
+      } elsif ( $TicketObj and $TicketObj->WillResolveObj->Unix > 0 ) {
           $DateObj->Set(Value => 0);
+          $ARGSRef->{'WillResolve'} = $DateObj->ISO;
       }
-      $ARGSRef->{'WillResolve'} = $DateObj->ISO;
     }
 
     if ( $ARGSRef->{'Queue'} and ( $ARGSRef->{'Queue'} !~ /^(\d+)$/ ) ) {
-- 
cgit v1.2.1