nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix unnecessary SQL query performed on unauthenticated requests (#11179)

This commit is contained in:
Eugen Rochko 2019-06-25 20:18:15 +02:00 committed by GitHub
parent 8d57795608
commit 6836587117
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/application_controller.rb
View File

@ -91,11 +91,15 @@ class ApplicationController < ActionController::Base
end end
def current_account def current_account
@current_account ||= current_user.try(:account) return @current_account if defined?(@current_account)
@current_account = current_user&.account
end end
def current_session def current_session
@current_session ||= SessionActivation.find_by(session_id: cookies.signed['_session_id']) return @current_session if defined?(@current_session)
@current_session = SessionActivation.find_by(session_id: cookies.signed['_session_id']) if cookies.signed['_session_id'].present?
end end
def current_theme def current_theme