From 824a72b22023996d13986ed5c2d9cb042568e5a5 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 28 Jul 2021 11:42:50 -0400
Subject: [PATCH] fix: updated ACP > Manage > Users to handle users with no
 email address

---
 public/language/en-GB/admin/manage/users.json |  1 +
 src/views/admin/manage/users.tpl              | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/public/language/en-GB/admin/manage/users.json b/public/language/en-GB/admin/manage/users.json
index 38a065b954..2a3c0c4829 100644
--- a/public/language/en-GB/admin/manage/users.json
+++ b/public/language/en-GB/admin/manage/users.json
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.no-email": "(no email)",
 	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index 011f8fdd20..18005830c1 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -105,12 +105,21 @@
 					<tr class="user-row">
 						<th><input component="user/select/single" data-uid="{users.uid}" type="checkbox"/></th>
 						<td class="text-right">{users.uid}</td>
-						<td><i title="[[admin/manage/users:users.banned]]" class="ban fa fa-gavel text-danger<!-- IF !users.banned --> hidden<!-- ENDIF !users.banned -->"></i><i class="administrator fa fa-shield text-success<!-- IF !users.administrator --> hidden<!-- ENDIF !users.administrator -->"></i><a href="{config.relative_path}/user/{users.userslug}"> {users.username}</a></td>
-
 						<td>
-						<i class="validated fa fa-check text-success<!-- IF !users.email:confirmed --> hidden<!-- ENDIF !users.email:confirmed -->" title="validated"></i>
-						<i class="notvalidated fa fa-check text-muted<!-- IF users.email:confirmed --> hidden<!-- ENDIF users.email:confirmed -->" title="not validated"></i>
-						 {users.email}</td>
+							<i title="[[admin/manage/users:users.banned]]" class="ban fa fa-gavel text-danger<!-- IF !users.banned --> hidden<!-- ENDIF !users.banned -->"></i>
+							<i class="administrator fa fa-shield text-success<!-- IF !users.administrator --> hidden<!-- ENDIF !users.administrator -->"></i>
+							<a href="{config.relative_path}/user/{users.userslug}"> {users.username}</a>
+						</td>
+						<td>
+							{{{ if ../email }}}
+							<i class="validated fa fa-check text-success<!-- IF !users.email:confirmed --> hidden<!-- ENDIF !users.email:confirmed -->" title="validated"></i>
+							<i class="notvalidated fa fa-check text-muted<!-- IF users.email:confirmed --> hidden<!-- ENDIF users.email:confirmed -->" title="not validated"></i>
+							{../email}
+							{{{ else }}}
+							<i class="notvalidated fa fa-check text-muted" title="not validated"></i>
+							<em class="text-muted">[[admin/manage/users:users.no-email]]</em>
+							{{{ end }}}
+						</td>
 						<td>{users.ip}</td>
 						<td class="text-right">{users.postcount}</td>
 						<td class="text-right">{users.reputation}</td>