jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3462 from evazion/fix-3460

Browse Source 
Fix #3460: Timeout in `update_last_ip_addr`.
This commit is contained in:
Albert Yi
2017-12-27 10:53:33 -08:00
committed by GitHub
parent c757cdeb12 e34754c65c
commit 4c947fb127
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/logical/session_loader.rb
View File

@@ -11,6 +11,8 @@ class SessionLoader
end end
def load def load
CurrentUser.user = AnonymousUser.new
if session[:user_id] if session[:user_id]
load_session_user load_session_user
elsif cookie_password_hash_valid? elsif cookie_password_hash_valid?
@@ -19,17 +21,12 @@ class SessionLoader
load_session_for_api load_session_for_api
end end
if CurrentUser.user set_statement_timeout
CurrentUser.user.unban! if CurrentUser.user.ban_expired?
else
CurrentUser.user = AnonymousUser.new
end
update_last_logged_in_at update_last_logged_in_at
update_last_ip_addr update_last_ip_addr
set_time_zone set_time_zone
store_favorite_tags_in_cookies store_favorite_tags_in_cookies
set_statement_timeout CurrentUser.user.unban! if CurrentUser.user.ban_expired?
end end
private private