X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6c202448ade514cd5ecca7175555011c851735e9..3cfffc2258621558e1147ceaf63980a7f6ed414b:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8c234006e..a3c21cd3d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -665,10 +665,10 @@ class UsersController < ApplicationController user.avatar.attach(params[:user][:avatar]) user.image_use_gravatar = false when "delete" then - user.avatar.purge + user.avatar.purge_later user.image_use_gravatar = false when "gravatar" then - user.avatar.purge + user.avatar.purge_later user.image_use_gravatar = true end @@ -779,7 +779,7 @@ class UsersController < ApplicationController # check if this user has a gravatar and set the user pref is true def gravatar_enable(user) # code from example https://en.gravatar.com/site/implement/images/ruby/ - return false if user.image.present? + return false if user.avatar.attached? hash = Digest::MD5.hexdigest(user.email.downcase) url = "https://www.gravatar.com/avatar/#{hash}?d=404" # without d=404 we will always get an image back