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

[rails.git] / app / views / api / users / _user.builder

diff --git a/app/views/api/users/_user.builder b/app/views/api/users/_user.builder
index 7bf8e18a5a3019537bc1f2ab24940be03aa7db41..638e8583fb5b0de6ff454847dda8270b83a92a50 100644 (file)
--- a/app/views/api/users/_user.builder
+++ b/app/views/api/users/_user.builder
@@ -8,7 +8,7 @@ xml.tag! "user", :id => user.id,
   else
     xml.tag! "contributor-terms", :agreed => user.terms_agreed.present?
   end
-  xml.tag! "img", :href => user_image_url(user) if user.image.file? || user.image_use_gravatar
+  xml.tag! "img", :href => user_image_url(user) if user.avatar.attached? || user.image.file? || user.image_use_gravatar
   xml.tag! "roles" do
     user.roles.each do |role|
       xml.tag! role.role