From 451fc88e4816fd9e59c6a201e06126887933b754 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 23 Sep 2015 02:29:13 +0200
Subject: [PATCH] Fixed escalation calculation for closed tickets.

---
 app/models/ticket/escalation.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models/ticket/escalation.rb b/app/models/ticket/escalation.rb
index f0bd5a19a..a7e94d551 100644
--- a/app/models/ticket/escalation.rb
+++ b/app/models/ticket/escalation.rb
@@ -48,10 +48,9 @@ returns
     if sla
       calendar = sla.calendar
     end
-    return if !calendar
 
     # if no escalation is enabled
-    if !sla
+    if !sla || !calendar
 
       # nothing to change
       return true if !escalation_time