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

Various Plugin Enhancements and Extension Points

Browse Source
This commit is contained in:
Robin Ward
2016-03-11 15:52:18 -05:00
parent 841cec1bc1
commit 1006b1ba94
10 changed files with 82 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/serializers/user_serializer.rb
View File

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