]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/user_controller.rb
Merge branch 'master' into openID
[rails.git] / app / controllers / user_controller.rb
index 00dbcafb6ac44d5ba6211ca38c6467077fdd1d5f..cc12cc9e74ca2f3d69540cd39911b014cb3533ca 100644 (file)
@@ -322,6 +322,10 @@ class UserController < ApplicationController
     @nickname = params['nickname']
     @email = params['email']
     @openID = params['openid']
     @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
   end
 
   def login