cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid trying to resize non-resizable images

Browse source 
Fixed #2329
This commit is contained in:
Tom Hughes 2019-07-31 11:42:09 +01:00
parent 9581fc24f8
commit 1addc078c0
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/helpers/user_helper.rb
View file

@ -8,7 +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
image_tag user_avatar_variant(user, :resize => "100x100>"), options
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?
image_tag user.avatar.variant(:resize => "50x50>"), options
image_tag user_avatar_variant(user, :resize => "50x50>"), options
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?
image_tag user.avatar.variant(:resize => "50x50>"), options
image_tag user_avatar_variant(user, :resize => "50x50>"), options
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?
polymorphic_url(user.avatar.variant(:resize => "100x100>"), :host => Settings.server_url)
polymorphic_url(user_avatar_variant(user, :resize => "100x100>"), :host => Settings.server_url)
else
image_url("avatar_large.png")
end
@ -67,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.