Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor, bypass gravatar update if user does not match 

this protects against a race condition that can happen when a user record
is destroyed reasonably quickly
This commit is contained in:
Sam 2018-10-23 12:20:21 +11:00
parent cee51672c9
commit de6b585368
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/jobs/regular/update_gravatar.rb
View File

@ -8,7 +8,7 @@ module Jobs
user = User.find_by(id: args[:user_id]) user = User.find_by(id: args[:user_id])
avatar = UserAvatar.find_by(id: args[:avatar_id]) avatar = UserAvatar.find_by(id: args[:avatar_id])
if user && avatar if user && avatar && avatar.user&.id == user.id
avatar.update_gravatar! avatar.update_gravatar!
if !user.uploaded_avatar_id && avatar.gravatar_upload_id if !user.uploaded_avatar_id && avatar.gravatar_upload_id
user.update_column(:uploaded_avatar_id, avatar.gravatar_upload_id) user.update_column(:uploaded_avatar_id, avatar.gravatar_upload_id)