Browse Source

avoid using rescue in its modifier form at ApplicationController#find_current_user

git-svn-id: http://svn.redmine.org/redmine/trunk@19862 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.0
Toshi MARUYAMA 3 years ago
parent
commit
562dea3aa8
1 changed files with 6 additions and 1 deletions
  1. 6
    1
      app/controllers/application_controller.rb

+ 6
- 1
app/controllers/application_controller.rb View File

@@ -106,7 +106,12 @@ class ApplicationController < ActionController::Base
unless api_request?
if session[:user_id]
# existing session
user = (User.active.find(session[:user_id]) rescue nil)
user =
begin
User.active.find(session[:user_id])
rescue
nil
end
elsif autologin_user = try_to_autologin
user = autologin_user
elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?

Loading…
Cancel
Save