From 06d07b8ef944faedb95e7db0147be24888d6da27 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Tue, 22 Jan 2019 15:07:55 -0200 Subject: [PATCH] [FIX] LDAP login of new users overwriting `fname` from all subscriptions (#13203) --- packages/rocketchat-lib/server/functions/setRealName.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/server/functions/setRealName.js b/packages/rocketchat-lib/server/functions/setRealName.js index 6bf2f183ef7..c177c6563ab 100644 --- a/packages/rocketchat-lib/server/functions/setRealName.js +++ b/packages/rocketchat-lib/server/functions/setRealName.js @@ -18,7 +18,10 @@ RocketChat._setRealName = function(userId, name) { RocketChat.models.Users.setName(user._id, name); user.name = name; - RocketChat.models.Subscriptions.updateDirectFNameByName(user.username, name); + // if user has no username, there is no need to updated any direct messages (there is none) + if (user.username && user.username !== '') { + RocketChat.models.Subscriptions.updateDirectFNameByName(user.username, name); + } if (RocketChat.settings.get('UI_Use_Real_Name') === true) { RocketChat.Notifications.notifyLogged('Users:NameChanged', {