summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rt/lib/RT/Action/ScheduledResolve.pm4
1 files changed, 3 insertions, 1 deletions
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 {