Merge remote-tracking branch 'upstream/pull/1974'

[rails.git] / app / helpers / user_helper.rb

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index dd4c343d8d96cafcd1919432fc6318fb85d5ac7f..065a562c4d282ad977ef51733b9f687a811bf988 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -38,7 +38,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     else
-      image_url(user.image.url)
+      image_url(user.image.url(:large))
     end
   end
 
@@ -48,7 +48,7 @@ module UserHelper
     image_tag "openid_small.png", :alt => t("user.login.openid_logo_alt"), :class => "openid_logo"
   end
 
-  def auth_button(name, provider, options)
+  def auth_button(name, provider, options = {})
     link_to(
       image_tag("#{name}.png", :alt => t("user.login.auth_providers.#{name}.alt")),
       auth_path(options.merge(:provider => provider)),
@@ -57,6 +57,8 @@ module UserHelper
     )
   end
 
+  private
+
   # Gravatar support
 
   # See http://en.gravatar.com/site/implement/images/ for details.