From cda55309d5e0444288968aaaa601a645f8738d94 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Wed, 21 Aug 2013 14:28:06 -0700 Subject: [PATCH] safety guard for ScheduledResolve action --- rt/lib/RT/Action/ScheduledResolve.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 { -- 2.11.0