From: Tom Hughes <tom@compton.nu>
Date: Tue, 11 May 2010 20:33:32 +0000 (+0100)
Subject: Report duplicate OpenID URLs cleanly
X-Git-Tag: live~6342
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/20c3bf698813c2d5f58b1457ce97f9466143169f?hp=64f373dc598e9c672e1575622f2fc76c29655b8d

Report duplicate OpenID URLs cleanly
---

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