Merge branch 'pull/5338'

[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 3a55e1cdedfcc12d9f3d02ca1135ed7f8f339feb..e2770eb69ea5bf655866b04499708eadd70a575e 100644 (file)
--- a/app/helpers/user_blocks_helper.rb
+++ b/app/helpers/user_blocks_helper.rb
@@ -20,7 +20,7 @@ module UserBlocksHelper
       # the max of the last update time or the ends_at time is when this block finished
       # either because the user viewed the block (updated_at) or it expired or was
       # revoked (ends_at)
       # the max of the last update time or the ends_at time is when this block finished
       # either because the user viewed the block (updated_at) or it expired or was
       # revoked (ends_at)

-      last_time = [block.ends_at, block.updated_at].max
+      last_time = block.deactivates_at || [block.ends_at, block.updated_at].max

       t("user_blocks.helper.time_past_html", :time => friendly_date_ago(last_time))
     end
   end
       t("user_blocks.helper.time_past_html", :time => friendly_date_ago(last_time))
     end
   end