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

5 years ago · 8ed78f0b85
parent 4dddee9b8d
commit 8ed78f0b85
1 changed files with 6 additions and 2 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -91,11 +91,15 @@ class ApplicationController < ActionController::Base
  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