diff --git a/app/models/forum_topic.rb b/app/models/forum_topic.rb index 7f1ae3950..1221650b0 100644 --- a/app/models/forum_topic.rb +++ b/app/models/forum_topic.rb @@ -106,6 +106,7 @@ class ForumTopic < ActiveRecord::Base end def read_by?(user, read_forum_topic_ids) + return true if updated_at < user.last_forum_read_at if read_forum_topic_ids.any? {|topic_id, timestamp| id.to_s == topic_id && updated_at.to_i > timestamp.to_i} return false end @@ -113,7 +114,6 @@ class ForumTopic < ActiveRecord::Base return true end return false if user.last_forum_read_at.nil? - return true if updated_at < user.last_forum_read_at return false end