From c9403138237768242a9d8291c9e585f0f58e0d9d Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 14 Jun 2011 22:39:33 +0100 Subject: [PATCH] Fix some broken tests --- app/controllers/user_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index fe5afd960..d380e4c7b 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -67,7 +67,7 @@ class UserController < ApplicationController elsif @user.terms_agreed? # Already agreed to terms, so just show settings redirect_to :action => :account, :display_name => @user.display_name - elsif params[:user] and not params[:user][:openid_url].empty? + elsif params[:user] and params[:user][:openid_url] and not params[:user][:openid_url].empty? # Verify OpenID before moving on session[:new_user] = @user openid_verify(params[:user][:openid_url], @user) @@ -125,7 +125,7 @@ class UserController < ApplicationController @user.languages = request.user_preferred_languages @user.terms_agreed = Time.now.getutc @user.terms_seen = true - @user.openid_url = nil if @user.openid_url.empty? + @user.openid_url = nil if @user.openid_url and @user.openid_url.empty? if @user.save flash[:notice] = t 'user.new.flash create success message', :email => @user.email -- 2.43.2