diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-01-11 09:11:18 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-01-11 09:11:18 +0000 |
| commit | 4e8307fe7bd88b6cdd9840a94f8275354aae0bd8 (patch) | |
| tree | fbe8ee2316ebd1f9c88158d18b761e3d7a85d25f /app/controllers/user_controller.rb | |
| parent | 65694bc2759aecd1ce59d1064a51004472ce4654 (diff) | |
Don't give an error to users with an invalid postredirect token. Closes #334.
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index fc29a847c..45b71a3a9 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -116,8 +116,10 @@ class UserController < ApplicationController render :action => 'sign' return else - @user_signin = User.authenticate_from_form(params[:user_signin], @post_redirect.reason_params[:user_name] ? true : false) - if @user_signin.errors.size > 0 + if !@post_redirect.nil? + @user_signin = User.authenticate_from_form(params[:user_signin], @post_redirect.reason_params[:user_name] ? true : false) + end + if @post_redirect.nil? || @user_signin.errors.size > 0 # Failed to authenticate render :action => 'sign' return |