This commit is contained in:
r888888888
2014-07-17 15:53:36 -07:00
parent a6d69e63be
commit bb402f5a27
11 changed files with 134 additions and 178 deletions

View File

@@ -13,10 +13,6 @@ class SessionLoader
load_session_user
elsif cookie_password_hash_valid?
load_cookie_user
# this means a new session is being created, so assume
# all the old forum topics can be marked as read
update_forum_last_read_at
else
load_session_for_api
end
@@ -104,16 +100,5 @@ private
def set_time_zone
Time.zone = CurrentUser.user.time_zone
end
def update_forum_last_read_at
unless CurrentUser.user.is_anonymous?
if CurrentUser.user.last_forum_read_at && CurrentUser.user.last_forum_read_at < CurrentUser.user.last_logged_in_at
CurrentUser.user.update_column(:last_forum_read_at, CurrentUser.user.last_logged_in_at)
elsif CurrentUser.user.last_forum_read_at.nil?
CurrentUser.user.update_column(:last_forum_read_at, CurrentUser.user.last_logged_in_at)
end
CurrentUser.user.update_column(:last_logged_in_at, Time.now)
end
end
end