diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-22 17:49:59 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-22 17:49:59 +0100 |
| commit | 15418b4f0aebb31643300e75c9c68e0e71a90560 (patch) | |
| tree | a1d061fac0994b39e99df570e14b29c8f088331b /app/controllers/user_controller.rb | |
| parent | 5116263e02fce228f9d1006945cb311829a7b586 (diff) | |
| parent | 7b2757e7be4ae2ddf0fa7cb694faf5799340f003 (diff) | |
Merge remote-tracking branch 'jpmckinney_github/parentheses' into rails-3-develop
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 91eb7baf4..47041a969 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -373,7 +373,7 @@ class UserController < ApplicationController if (not session[:user_circumstance]) or (session[:user_circumstance] != "change_email") # don't store the password in the db params[:signchangeemail].delete(:password) - post_redirect = PostRedirect.new(:uri => signchangeemail_url(), + post_redirect = PostRedirect.new(:uri => signchangeemail_url, :post_params => params, :circumstance => "change_email" # special login that lets you change your email ) @@ -510,7 +510,7 @@ class UserController < ApplicationController else flash[:notice] = _("<p>Thanks for updating your profile photo.</p> <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>") - redirect_to set_profile_about_me_url() + redirect_to set_profile_about_me_url end else render :template => 'user/set_draft_profile_photo' @@ -596,7 +596,7 @@ class UserController < ApplicationController else flash[:notice] = _("<p>Thanks for changing the text about you on your profile.</p> <p><strong>Next...</strong> You can upload a profile photograph too.</p>") - redirect_to set_profile_photo_url() + redirect_to set_profile_photo_url end end |