From 64b9fe52dd44ac2b5768e6aa952ce3a949da77d3 Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Thu, 12 Jan 2017 12:31:01 +0100
Subject: [PATCH] Handle deleted users in comments gracefully

---
 .../app/coffee/Features/User/UserInfoController.coffee |  2 ++
 .../controllers/ReviewPanelController.coffee           | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/services/web/app/coffee/Features/User/UserInfoController.coffee b/services/web/app/coffee/Features/User/UserInfoController.coffee
index a77f575a48..8054f48afe 100644
--- a/services/web/app/coffee/Features/User/UserInfoController.coffee
+++ b/services/web/app/coffee/Features/User/UserInfoController.coffee
@@ -30,6 +30,8 @@ module.exports = UserController =
 		res.send JSON.stringify(info)
 
 	formatPersonalInfo: (user, callback = (error, info) ->) ->
+		if !user?
+			return {}
 		formatted_user = { id: user._id.toString() }
 		for key in ["first_name", "last_name", "email", "signUpDate", "role", "institution"]
 			if user[key]?
diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
index f68e6518c2..3b9990564e 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -373,7 +373,9 @@ define [
 			return comment
 
 		formatUser = (user) ->
-			if !user?
+			id = user?._id or user?.id
+
+			if !id?
 				return {
 					email: null
 					name: "Anonymous"
@@ -381,13 +383,13 @@ define [
 					hue: ColorManager.ANONYMOUS_HUE
 					avatar_text: "A"
 				}
-
-			id = user._id or user.id
 			if id == window.user_id
 				name = "You"
 				isSelf = true
 			else
-				name = "#{user.first_name} #{user.last_name}"
+				name = [user.first_name, user.last_name].filter((n) -> n?).join(" ")
+				if name == ""
+					name = "Unknown"
 				isSelf = false
 			return {
 				id: id