X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/433464ecc2c3a6d265bd21c188662e319837f5b1..9fbd888e04e545bf61789973b1ed5b457e2b1be9:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 00dbcafb6..f02cd6dc1 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -49,7 +49,7 @@ class UserController < ApplicationController
         @user.openid_url = nil
 
         if (!params[:user][:openid_url].nil? and params[:user][:openid_url].length > 0)
-          if @user.pass_crypt.length == 0 
+          if (@user.pass_crypt.nil? or @user.pass_crypt.length == 0)
             #if the password is empty, but we have a openid 
             #then generate a random passowrd to disable 
             #loging in via password 
@@ -322,6 +322,10 @@ class UserController < ApplicationController
     @nickname = params['nickname']
     @email = params['email']
     @openID = params['openid']
+	
+    if !params['openid'].nil?
+	  flash.now[:notice] = t 'user.new.openID association'
+	end
   end
 
   def login