From: Mark Wells <mark@freeside.biz>
Date: Wed, 21 Aug 2013 21:27:56 +0000 (-0700)
Subject: safety guard for ScheduledResolve action
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=024f58c36ee546ea711de98a3c71902e907554e6;p=freeside.git

safety guard for ScheduledResolve action
---

diff --git a/rt/lib/RT/Action/ScheduledResolve.pm b/rt/lib/RT/Action/ScheduledResolve.pm
index 6b323cb6f..dafa91a40 100644
--- a/rt/lib/RT/Action/ScheduledResolve.pm
+++ b/rt/lib/RT/Action/ScheduledResolve.pm
@@ -20,7 +20,9 @@ sub Prepare {
       'deleted'
     ); # don't resolve from any of these states.
     my $time = $self->TicketObj->WillResolveObj->Unix;
-    return ( $time > 0 and $time < time() );
+    # resolve if the WillResolve date is set, and in the past,
+    # and less than a year old
+    return ( $time > 0 and $time < time() and (time() - $time) < 31536000 );
 }
 
 sub Commit {