diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-05-10 07:21:39 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-05-10 07:21:39 +0000 |
| commit | 68723c20d2abd8dd0df8aaa69736d469de58446f (patch) | |
| tree | 0b8700de55f11944307b5f7579b34d407e7aa92d /app | |
| parent | b8811f47ccf554895b1b48be3f881dc74b4fc3dd (diff) | |
| download | redmine-68723c20d2abd8dd0df8aaa69736d469de58446f.tar.gz redmine-68723c20d2abd8dd0df8aaa69736d469de58446f.zip | |
Merged r14245 (#19655).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14249 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e52cc6186..6e2136836 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -63,9 +63,9 @@ class ApplicationController < ActionController::Base if session[:user_id] if session_expired? && !try_to_autologin set_localization(User.active.find_by_id(session[:user_id])) - reset_session + self.logged_user = nil flash[:error] = l(:error_session_expired) - redirect_to signin_url + require_login else session[:atime] = Time.now.utc.to_i end |