discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-09 14:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3750 from tgxworld/fix_broken_serializer

Browse Source 
FIX: Broken BasicUserSerializer.
This commit is contained in:
Sam 2015-09-11 15:45:05 +10:00
commit 43f8b2b41a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/serializers/basic_user_serializer.rb
View File

@ -9,7 +9,7 @@ class BasicUserSerializer < ApplicationSerializer
if Hash === object if Hash === object
User.avatar_template(user[:username], user[:uploaded_avatar_id]) User.avatar_template(user[:username], user[:uploaded_avatar_id])
else else
object.avatar_template user.try(:avatar_template)
end end
end end
@ -21,7 +21,7 @@ class BasicUserSerializer < ApplicationSerializer
if Hash === object if Hash === object
User.letter_avatar_color(user[:username]) User.letter_avatar_color(user[:username])
else else
object.letter_avatar_color user.try(:letter_avatar_color)
end end
end end