Report duplicate OpenID URLs cleanly

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 0459d9a534eb6a581600364ee49e2c6a363eea5a..726fb1cd7b81d075e160e145e14ea0b9fa969482 100644 (file)
--- 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 83a4d39e4e8d659b2d604bd4c5bd39f6e6626ad5..4e3f4428d6f11194c339f31fa1d115ee1ddf4b23 100644 (file)
--- 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