diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-12 13:52:36 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-12 13:52:36 +0000 |
| commit | d84353a0dbff7c4543c7f4423d7b63728c7041c3 (patch) | |
| tree | 2bcfaa2b7cbe0eedccad518c8c2d064203a2143c /app/controllers/user_controller.rb | |
| parent | 2d0524b90108004d67b5ee7f21b7b69ebf8eb3df (diff) | |
| parent | 21ee1ca03faa722119a3c7e587a843b960783096 (diff) | |
Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into release/0.5
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 |