Prioritise strings[].name over strings[].community

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index e9e8f6bfb1e553b0066250c2bcdaa1069d23c2bf..69b0f6d6bc5ca833e9df2983b60596fee60f95d2 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -8,7 +8,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?

-      image_tag user_avatar_variant(user, :resize => "100x100>"), options
+      image_tag user_avatar_variant(user, :resize_to_limit => [100, 100]), options

     else
       image_tag "avatar_large.png", options
     end
     else
       image_tag "avatar_large.png", options
     end


@@ -21,7 +21,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?

-      image_tag user_avatar_variant(user, :resize => "50x50>"), options
+      image_tag user_avatar_variant(user, :resize_to_limit => [50, 50]), options

     else
       image_tag "avatar_small.png", options
     end
     else
       image_tag "avatar_small.png", options
     end


@@ -34,7 +34,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
     elsif user.avatar.attached?

-      image_tag user_avatar_variant(user, :resize => "50x50>"), options
+      image_tag user_avatar_variant(user, :resize_to_limit => [50, 50]), options

     else
       image_tag "avatar_small.png", options
     end
     else
       image_tag "avatar_small.png", options
     end


@@ -44,7 +44,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     elsif user.avatar.attached?
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     elsif user.avatar.attached?

-      polymorphic_url(user_avatar_variant(user, :resize => "100x100>"), :host => Settings.server_url)
+      polymorphic_url(user_avatar_variant(user, :resize_to_limit => [100, 100]), :host => Settings.server_url)

     else
       image_url("avatar_large.png")
     end
     else
       image_url("avatar_large.png")
     end