summaryrefslogtreecommitdiffstats
path: root/app/controllers/my_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/my_controller.rb')
-rw-r--r--app/controllers/my_controller.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 59d1d2d0f..714b23857 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -100,6 +100,9 @@ class MyController < ApplicationController
@user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
@user.must_change_passwd = false
if @user.save
+ # Reset the session creation time to not log out this session on next
+ # request due to ApplicationController#force_logout_if_password_changed
+ session[:ctime] = Time.now.utc.to_i
flash[:notice] = l(:notice_account_password_updated)
redirect_to my_account_path
end