From 20c3bf698813c2d5f58b1457ce97f9466143169f Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 11 May 2010 21:33:32 +0100 Subject: [PATCH] Report duplicate OpenID URLs cleanly --- app/controllers/user_controller.rb | 1 - app/views/user/new.html.erb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 0459d9a53..726fb1cd7 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -45,7 +45,6 @@ class UserController < ApplicationController session[:referer] = params[:referer] @user = User.new(params[:user]) - @user.openid_url = nil if params[:user][:openid_url] and @user.pass_crypt.empty? # We are creating an account with OpenID and no password diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb index 83a4d39e4..4e3f4428d 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -75,7 +75,7 @@ <%= update_page_tag do |page| - if params[:openid] + if params[:openid] or (@user and @user.openid_url) page[:openid_prompt].hide else page[:openid_spacer].hide -- 2.43.2