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

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 86990f9fb7ba4ea9e28c3eb49e858e7794c6ca78..74f16380c2ab93d8814f864e54d2f78036627931 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -8,9 +8,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
-      image_tag user.avatar.variant(:resize => "100x100>"), options
-    elsif user.image.file?
-      image_tag user.image.url(:large), options
+      image_tag user_avatar_variant(user, :resize => "100x100>"), options
     else
       image_tag "avatar_large.png", options
     end
@@ -23,9 +21,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
-      image_tag user.avatar.variant(:resize => "50x50>"), options
-    elsif user.image.file?
-      image_tag user.image.url(:small), options
+      image_tag user_avatar_variant(user, :resize => "50x50>"), options
     else
       image_tag "avatar_small.png", options
     end
@@ -38,9 +34,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
-      image_tag user.avatar.variant(:resize => "50x50>"), options
-    elsif user.image.file?
-      image_tag user.image.url(:small), options
+      image_tag user_avatar_variant(user, :resize => "50x50>"), options
     else
       image_tag "avatar_small.png", options
     end
@@ -50,9 +44,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     elsif user.avatar.attached?
-      polymorphic_url(user.avatar.variant(:resize => "100x100>"))
-    elsif user.image.file?
-      image_url(user.image.url(:large))
+      polymorphic_url(user_avatar_variant(user, :resize => "100x100>"), :host => Settings.server_url)
     else
       image_url("avatar_large.png")
     end
@@ -75,6 +67,16 @@ module UserHelper
 
   private
 
+  # Local avatar support
+
+  def user_avatar_variant(user, options)
+    if user.avatar.variable?
+      user.avatar.variant(options)
+    else
+      user.avatar
+    end
+  end
+
   # Gravatar support
 
   # See http://en.gravatar.com/site/implement/images/ for details.