Merge branch 'pull/5503'

[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..f18a6250c9e556f65892b30eca7691fd2e6f1ba4 100644 (file)
--- a/app/helpers/user_blocks_helper.rb
+++ b/app/helpers/user_blocks_helper.rb
@@ -34,8 +34,8 @@ module UserBlocksHelper
       end
     else
       if block.revoker_id.nil?
-        if block.updated_at > block.ends_at
-          t("user_blocks.helper.short.read_html", :time => block_short_time_in_past(block.updated_at))
+        if block.deactivates_at > block.ends_at
+          t("user_blocks.helper.short.read_html", :time => block_short_time_in_past(block.deactivates_at))
         else
           t("user_blocks.helper.short.ended")
         end