diff options
| -rw-r--r-- | lib/mauve/notifiers/xmpp.rb | 2 | ||||
| -rw-r--r-- | lib/mauve/web_interface.rb | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/lib/mauve/notifiers/xmpp.rb b/lib/mauve/notifiers/xmpp.rb index b291442..137ca74 100644 --- a/lib/mauve/notifiers/xmpp.rb +++ b/lib/mauve/notifiers/xmpp.rb @@ -605,8 +605,6 @@ EOF begin now = Time.now - now.bank_holidays = Server.instance.bank_holidays - ack_until = now.in_x_hours(n_hours, type_hours) rescue RangeError return "I'm sorry, you tried to acknowedge for far too long, and my buffers overflowed!" diff --git a/lib/mauve/web_interface.rb b/lib/mauve/web_interface.rb index a8e1ece..fb19abd 100644 --- a/lib/mauve/web_interface.rb +++ b/lib/mauve/web_interface.rb @@ -222,8 +222,6 @@ EOF if ack_until.to_s.empty? now = Time.now - now.bank_holidays = Server.instance.bank_holidays - ack_until = now.in_x_hours(n_hours, type_hours.to_s) else ack_until = Time.at(ack_until.to_i) @@ -280,7 +278,6 @@ EOF n_hours = ( n_hours > 300 ? 300 : n_hours ) type_hours = "daytime" unless %w(daytime working wallclock).include?(type_hours) now = Time.now - now.bank_holidays = Server.instance.bank_holidays ack_until = now.in_x_hours(n_hours, type_hours) # @@ -369,8 +366,6 @@ EOF if ack_until == 0 now = Time.now - now.bank_holidays = Server.instance.bank_holidays - ack_until = now.in_x_hours(n_hours, type_hours) else ack_until = Time.at(ack_until) |