From 83ecb516a4df5d4d03930af7b8ace1c9476d69a2 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 10 Jun 2011 21:48:17 +0100 Subject: [PATCH 1/1] Make password signups work --- app/controllers/user_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 9e2961df2..fe5afd960 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 params[:user][:openid_url] + elsif params[:user] and not params[:user][:openid_url].empty? # Verify OpenID before moving on session[:new_user] = @user openid_verify(params[:user][:openid_url], @user) @@ -125,6 +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? if @user.save flash[:notice] = t 'user.new.flash create success message', :email => @user.email -- 2.43.2