Fix unnecessary SQL query performed on unauthenticated requests (mast…

…odon#11179)
ProjectMyosotis · Oct 2, 2019 · 452eecc · 452eecc
1 parent 5a3909a
commit 452eecc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -91,11 +91,15 @@ def use_seamless_external_login?
  end
 
  def current_account
- @current_account ||= current_user.try(:account)
+ return @current_account if defined?(@current_account)
+
+ @current_account = current_user&.account
  end
 
  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
 
  def current_theme