From 60de0844754fd9102027e013db0375429a6054f1 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 3 Sep 2021 13:36:56 -0400 Subject: [PATCH] fix: simplify logic for fullname and email blanking in user retrieval (getUserDataByUserSlug) Previous logic seemed to match the logic used in privileges.users.canEdit, except the latter allows plugins to modify the value. --- src/controllers/accounts/helpers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js index 7628347dda..c3a4cb6d35 100644 --- a/src/controllers/accounts/helpers.js +++ b/src/controllers/accounts/helpers.js @@ -43,13 +43,13 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {}) userData.emailClass = 'hide'; - if (!isAdmin && !isGlobalModerator && !isSelf && (!userSettings.showemail || meta.config.hideEmail)) { + if (!results.canEdit && (!userSettings.showemail || meta.config.hideEmail)) { userData.email = ''; } else if (!userSettings.showemail) { userData.emailClass = ''; } - if (!isAdmin && !isGlobalModerator && !isSelf && (!userSettings.showfullname || meta.config.hideFullname)) { + if (!results.canEdit && (!userSettings.showfullname || meta.config.hideFullname)) { userData.fullname = ''; }