diff options
| author | Mark Wells <mark@freeside.biz> | 2013-08-17 17:06:47 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2013-08-17 17:06:47 -0700 |
| commit | dd3008b963344eea451d03094dfe8058db79bd77 (patch) | |
| tree | 5d25ec3d300692952661b1cc787b20c0d8aaa4fe | |
| parent | 26d71c2ec4c4034285932ded62581ad2ae5d8f5c (diff) | |
fix upgrade bug that was causing tickets to spontaneously resolve, #23309
| -rw-r--r-- | FS/FS/TicketSystem.pm | 5 | ||||
| -rw-r--r-- | rt/lib/RT/Interface/Web_Vendor.pm | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/FS/FS/TicketSystem.pm b/FS/FS/TicketSystem.pm index 3aeadb3..c1c69fa 100644 --- a/FS/FS/TicketSystem.pm +++ b/FS/FS/TicketSystem.pm @@ -342,11 +342,6 @@ sub _upgrade_data { or die $dbh->errstr; $cve_2013_3373_sth->execute or die $cve_2013_3373_sth->errstr; - # fix null WillResolve fields to avoid spurious transactions the - # first time they get updated - my $fix_null_sql = "UPDATE Tickets SET WillResolve = '1970-01-01 00:00:00' WHERE WillResolve IS NULL"; - $dbh->do($fix_null_sql) or die $dbh->errstr; - return; } diff --git a/rt/lib/RT/Interface/Web_Vendor.pm b/rt/lib/RT/Interface/Web_Vendor.pm index 023dede..0c061e2 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+)$/ ) ) { |