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

[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 c7c12f6d1f17901f54e05367c35b9d4fdc69bd2e..75bd4a46daec8b1ce277f0b01e59f8f2e3f7cf8d 100644 (file)
--- a/app/helpers/user_blocks_helper.rb
+++ b/app/helpers/user_blocks_helper.rb
@@ -34,7 +34,7 @@ module UserBlocksHelper
       end
     else
       if block.revoker_id.nil?
       end
     else
       if block.revoker_id.nil?

-        if block.updated_at > block.ends_at
+        if block.deactivates_at > block.ends_at

           t("user_blocks.helper.short.read_html", :time => block_short_time_in_past(block.updated_at))
         else
           t("user_blocks.helper.short.ended")
           t("user_blocks.helper.short.read_html", :time => block_short_time_in_past(block.updated_at))
         else
           t("user_blocks.helper.short.ended")