From 4a4406de8c716345aa05d77464ceb63a34abf4e1 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 14 Jun 2018 09:22:42 -0400
Subject: [PATCH] FIX: Properly avoid n+1 query on flagged posts

This code was in here previously but some columns were included that
were not used.
---
 app/serializers/flagged_user_serializer.rb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/serializers/flagged_user_serializer.rb b/app/serializers/flagged_user_serializer.rb
index 0e29df3bf53..9ada8a72965 100644
--- a/app/serializers/flagged_user_serializer.rb
+++ b/app/serializers/flagged_user_serializer.rb
@@ -21,15 +21,12 @@ class FlaggedUserSerializer < BasicUserSerializer
   def custom_fields
     fields = User.whitelisted_user_custom_fields(scope)
 
-    if scope.can_edit?(object)
-      fields += DiscoursePluginRegistry.serialized_current_user_fields.to_a
+    result = {}
+    fields.each do |k|
+      result[k] = object.custom_fields[k] if object.custom_fields[k].present?
     end
 
-    if fields.present?
-      User.custom_fields_for_ids([object.id], fields)[object.id] || {}
-    else
-      {}
-    end
+    result
   end
 
 end