From 5d9d2cf2871ce127c207f2efa192c2eb2eeb35f2 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 20 Apr 2017 21:45:52 +0530
Subject: [PATCH] FIX: do not explicitly show email of flagger / flagged user

---
 app/serializers/flagged_user_serializer.rb | 1 -
 lib/guardian.rb                            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/serializers/flagged_user_serializer.rb b/app/serializers/flagged_user_serializer.rb
index 899602b9fe..c9ec0aa6e8 100644
--- a/app/serializers/flagged_user_serializer.rb
+++ b/app/serializers/flagged_user_serializer.rb
@@ -3,7 +3,6 @@ class FlaggedUserSerializer < BasicUserSerializer
              :can_be_deleted,
              :post_count,
              :topic_count,
-             :email,
              :ip_address
 
   def can_delete_all_posts
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 9bd211e498..48af49e63d 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -159,7 +159,7 @@ class Guardian
   end
 
   def can_view_action_logs?(target)
-    is_staff? && target
+    target.present? && is_staff?
   end
 
   # Can we approve it?