mirror of
https://github.com/redmine/redmine.git
synced 2025-12-16 05:20:28 +01:00
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
This commit is contained in:
@@ -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?
|
||||
|
||||
Reference in New Issue
Block a user