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

Merge branch 'master' of github.com:discourse/discourse

This commit is contained in:
Sam 2017-12-14 17:17:02 +11:00
parent 96584403cd 34342ad0d8
commit 14cfce2827
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/controllers/user_avatars_controller.rb
View File

@ -107,7 +107,7 @@ class UserAvatarsController < ApplicationController
return redirect_to cdn_path(avatar_url) return redirect_to cdn_path(avatar_url)
end end
upload = Upload.find_by(id: upload_id) if user.user_avatar.contains_upload?(upload_id) upload = Upload.find_by(id: upload_id) if user&.user_avatar&.contains_upload?(upload_id)
upload ||= user.uploaded_avatar if user.uploaded_avatar_id == upload_id upload ||= user.uploaded_avatar if user.uploaded_avatar_id == upload_id
if user.uploaded_avatar && !upload if user.uploaded_avatar && !upload