Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

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

Browse source
This commit is contained in:
Sam 2017-12-14 17:17:02 +11:00
commit 14cfce2827
1 changed files with 1 additions and 1 deletions
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)
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
if user.uploaded_avatar && !upload