codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-24 08:09:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix url not to be nil

Browse source
This commit is contained in:
Fabiano Leite 2013-08-14 21:55:25 -03:00 committed by fabianoleittes
parent 8fa9c51bf4
commit 4df8babb9a
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/models/user.rb
View file

@ -322,7 +322,7 @@ class User < ActiveRecord::Base
if SiteSetting.allow_uploaded_avatars? && use_uploaded_avatar
# the avatars might take a while to generate
# so return the url of the original image in the meantime
uploaded_avatar_template.present? ? uploaded_avatar_template : uploaded_avatar.url
uploaded_avatar_template.present? ? uploaded_avatar_template : uploaded_avatar.try(:url)
else
User.gravatar_template(email)
end