github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 08:44:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Adds a class that can detect whether a user has uploaded a custom avatar

Browse Source
This commit is contained in:
Robin Ward
2013-09-10 15:18:22 -04:00
parent 21e08a423e
commit 2319924206
3 changed files with 107 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/models/user.rb
View File

@ -300,14 +300,15 @@ class User < ActiveRecord::Base
template.gsub("{size}", "45")
end
# the avatars might take a while to generate
# so return the url of the original image in the meantime
def uploaded_avatar_path
return unless SiteSetting.allow_uploaded_avatars? && use_uploaded_avatar
uploaded_avatar_template.present? ? uploaded_avatar_template : uploaded_avatar.try(:url)
end
def avatar_template
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.try(:url)
else
User.gravatar_template(email)
end
uploaded_avatar_path || User.gravatar_template(email)
end
# Updates the denormalized view counts for all users