From 4a45d1e6bb13cc43f51f9b8d1e74b4e15ed5aab1 Mon Sep 17 00:00:00 2001 From: Toks Date: Fri, 6 Jun 2014 13:43:27 -0400 Subject: [PATCH] Potential fix for #2124 --- app/logical/session_loader.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/logical/session_loader.rb b/app/logical/session_loader.rb index bbaeebdbf..ed736de57 100644 --- a/app/logical/session_loader.rb +++ b/app/logical/session_loader.rb @@ -107,7 +107,11 @@ private def update_forum_last_read_at unless CurrentUser.user.is_anonymous? - CurrentUser.user.update_column(:last_forum_read_at, CurrentUser.user.last_logged_in_at) + 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