Merge remote-tracking branch 'upstream/pull/3300'

[rails.git] / app / helpers / user_blocks_helper.rb

diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb
index 73425edec4b028f1752cf109bc199fa20a58b32b..95b6cb600c739786701c0cb95c6fe8470c4428a3 100644 (file)
--- a/app/helpers/user_blocks_helper.rb
+++ b/app/helpers/user_blocks_helper.rb
@@ -26,9 +26,11 @@ module UserBlocksHelper
   end
 
   def block_duration_in_words(duration)
   end
 
   def block_duration_in_words(duration)

+    # Ensure the requested duration isn't negative, even by a millisecond
+    duration = 0 if duration.negative?

     parts = ActiveSupport::Duration.build(duration).parts
     if duration < 1.day
     parts = ActiveSupport::Duration.build(duration).parts
     if duration < 1.day

-      t("user_blocks.helper.block_duration.hours", :count => parts[:hours])
+      t("user_blocks.helper.block_duration.hours", :count => parts.fetch(:hours, 0))

     elsif duration < 1.week
       t("user_blocks.helper.block_duration.days", :count => parts[:days])
     elsif duration < 1.month
     elsif duration < 1.week
       t("user_blocks.helper.block_duration.days", :count => parts[:days])
     elsif duration < 1.month