Update to rails 6.1.4.2

[rails.git] / app / controllers / sessions_controller.rb

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 13047167075245b17ee6f09353a14c81d9ef5464..bb3854e69b3d48348c394faa8dbc4ec6b2b2ac48 100644 (file)
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -4,6 +4,9 @@ class SessionsController < ApplicationController
   layout "site"
 
   before_action :disable_terms_redirect, :only => [:destroy]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :check_database_readable
   before_action :require_cookies, :only => [:new]
 
   authorize_resource :class => false
@@ -31,10 +34,14 @@ class SessionsController < ApplicationController
         token&.destroy
         session.delete(:token)
       end
+
       session.delete(:user)
       session_expires_automatically
-      if params[:referer]
-        redirect_to safe_referer(params[:referer])
+
+      referer = safe_referer(params[:referer]) if params[:referer]
+
+      if referer
+        redirect_to referer
       else
         redirect_to :controller => "site", :action => "index"
       end