demorgan

waferbaby · Oct 24, 2017 · 476c04c · 476c04c
1 parent 9299c08
commit 476c04c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/models/comment.rb b/app/models/comment.rb
@@ -71,9 +71,9 @@ def self.arrange_for_user(user)
         # for deleted comments, if they have no children, they can be removed
         # from the tree.  otherwise they have to stay and a "[deleted]" stub
         # will be shown
-        if node.is_gone? and # deleted or moderated
-          !children.present? and # no have child comments
-          (user && (user.is_moderator? || node.user_id == user.id))
+        if node.is_gone? && # deleted or moderated
+          !children.present? && # don't have child comments
+          (!user || (!user.is_moderator? && node.user_id != user.id))
           # admins and authors should be able to see their deleted comments
           next
         end