diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-01-07 09:53:18 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-01-07 09:53:18 +0000 |
| commit | b803759551cc036a5e043a2991f386d8bcd0a398 (patch) | |
| tree | 61c6c01bc21802d17f7bebb90c3def451cd8d889 /app/controllers/user_controller.rb | |
| parent | 76950510e850d7f09af9710d86bd94c815fd7759 (diff) | |
| parent | be4f5819bd4b18ef0e241ee846d6b42fc7a36cbe (diff) | |
Merge branch 'hotfix/0.20.0.2' into rails-3-develop
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index b7c8252f5..56f42891d 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -256,7 +256,7 @@ class UserController < ApplicationController def signout clear_session_credentials if params[:r] - redirect_to params[:r] + redirect_to URI.parse(params[:r]).path else redirect_to :controller => "general", :action => "frontpage" end @@ -596,7 +596,7 @@ class UserController < ApplicationController end @user.receive_email_alerts = params[:receive_email_alerts] @user.save! - redirect_to params[:came_from] + redirect_to URI.parse(params[:came_from]).path end private |