Improve blocks on/by links on user pages

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index bccd5d5cb499480ccf1055cbaa75075631159312..443c433a50804198c701f5492db37068116e3d4c 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -517,7 +517,7 @@ private
         if user = User.find_by_openid_url(identity_url)
           case user.status
             when "pending" then
         if user = User.find_by_openid_url(identity_url)
           case user.status
             when "pending" then

-              failed_login t('user.login.account not active')
+              failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name))

             when "active", "confirmed" then
               successful_login(user)
             when "suspended" then
             when "active", "confirmed" then
               successful_login(user)
             when "suspended" then


@@ -534,8 +534,8 @@ private
           # to the create account page with username and email filled
           # in if they have been given by the OpenID provider through
           # the simple registration protocol.
           # to the create account page with username and email filled
           # in if they have been given by the OpenID provider through
           # the simple registration protocol.

-          nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"]
-          email = sreg["email"] || ax["http://axschema.org/contact/email"]
+          nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"].first
+          email = sreg["email"] || ax["http://axschema.org/contact/email"].first

           redirect_to :controller => 'user', :action => 'new', :nickname => nickname, :email => email, :openid => identity_url
         end
       elsif result.missing?
           redirect_to :controller => 'user', :action => 'new', :nickname => nickname, :email => email, :openid => identity_url
         end
       elsif result.missing?