diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-28 11:00:31 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-28 11:00:31 +0100 |
| commit | 07b8c95e66d8709b4bfbc52443ea227ff43097db (patch) | |
| tree | 6df1aaa9ec4e787b1c09ee1e2e739ed315e18f30 /app/controllers/user_controller.rb | |
| parent | e936b687a7df62dc69d1cc0493492346bd8e300a (diff) | |
| parent | 0d25d79a48ea227ec685e44ec22990e1da748972 (diff) | |
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 47041a969..bb4ba28d1 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -177,7 +177,7 @@ class UserController < ApplicationController return else if !@post_redirect.nil? - @user_signin = User.authenticate_from_form(params[:user_signin], @post_redirect.reason_params[:user_name] ? true : false) + @user_signin = User.authenticate_from_form(params[:user_signin], @post_redirect.reason_params[:user_name]) end if @post_redirect.nil? || @user_signin.errors.size > 0 # Failed to authenticate |