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

Merge pull request #1333 from fabianoleittes/fix_type_url 

Fix url not to be nil
This commit is contained in:
Sam 2013-08-14 20:04:00 -07:00
parent 1eecb0cee5 4df8babb9a
commit b55c9e391d
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 if SiteSetting.allow_uploaded_avatars? && use_uploaded_avatar
# the avatars might take a while to generate # the avatars might take a while to generate
# so return the url of the original image in the meantime # 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 else
User.gravatar_template(email) User.gravatar_template(email)
end end