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

FIX: serialize current user fields in standard user serializer

Browse Source
This commit is contained in:
Sam
2015-12-05 17:50:03 +11:00
parent d97b2382e6
commit c82b33600a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/serializers/user_serializer.rb
View File

@ -333,8 +333,13 @@ class UserSerializer < BasicUserSerializer
def custom_fields
fields = nil
if scope.can_edit?(object)
fields = DiscoursePluginRegistry.serialized_current_user_fields.to_a
end
if SiteSetting.public_user_custom_fields.present?
fields = SiteSetting.public_user_custom_fields.split('|')
fields ||= []
fields += SiteSetting.public_user_custom_fields.split('|')
end
if fields.present?