summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-05-13 09:46:36 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-05-13 09:46:36 +0000
commit81c207b193e4b6a5e05e45301a2f90ac840747f0 (patch)
treed78fab7fbaca5a8dcf507ae0f94e603a6ead5d65
parent60cdcd55226318d23f5ddc9f419776d6d64e916d (diff)
downloadredmine-81c207b193e4b6a5e05e45301a2f90ac840747f0.tar.gz
redmine-81c207b193e4b6a5e05e45301a2f90ac840747f0.zip
Restored rescue statement removed in r9684.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9685 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/users_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0c5fd9e89..8b7bf6d02 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -169,6 +169,8 @@ class UsersController < ApplicationController
format.api { render_validation_errors(@user) }
end
end
+ rescue ::ActionController::RedirectBackError
+ redirect_to :controller => 'users', :action => 'edit', :id => @user
end
def destroy