Drop paperclip

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index c22fef1ea2fa71e8d2f0a922a89e13316d5c5564..7914805eafb3d0a846ea71ce511c543ff901798e 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -9,8 +9,6 @@ module UserHelper
       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
     else
       image_tag "avatar_large.png", options
     end
@@ -24,8 +22,6 @@ module UserHelper
       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
     else
       image_tag "avatar_small.png", options
     end
@@ -39,8 +35,6 @@ module UserHelper
       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
     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?
-      url_for(user.avatar.variant(:resize => "100x100>"))
-    elsif user.image.file?
-      image_url(user.image.url(:large))
+      polymorphic_url(user.avatar.variant(:resize => "100x100>"), :host => Settings.server_url)
     else
       image_url("avatar_large.png")
     end