aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/user_controller.rb
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2015-05-28 09:44:20 +0100
committerGareth Rees <gareth@mysociety.org>2015-05-28 09:44:20 +0100
commit47c4c79948bb2fc35e24a898fda7fb636fda655d (patch)
tree7d7add385b0e0b8b4f1ac9be843a397b3022e28c /app/controllers/user_controller.rb
parentc6e8e298fd0861cd822f23f370a01ccbc21cb9d3 (diff)
parentd8da040dce219f66e7788bddf645ce9c9aa017f4 (diff)
Merge remote-tracking branch 'jpmckinney/truefalse' into rails-3-develop
Diffstat (limited to 'app/controllers/user_controller.rb')
-rw-r--r--app/controllers/user_controller.rb2
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