diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-12-01 11:34:53 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-12-01 11:34:53 -0500 |
commit | 2b2ee62a1df0504fff3f3e0e59966db1cd297531 (patch) | |
tree | 03f9a86f5c679a643a6a064e75c4046fde972744 /web/react/utils/utils.jsx | |
parent | 272ed29a85b617bfe771917e1f5cbe27c740946f (diff) | |
parent | 478af4bf7501404ab53dd9afe981b26721682834 (diff) | |
download | chat-2b2ee62a1df0504fff3f3e0e59966db1cd297531.tar.gz chat-2b2ee62a1df0504fff3f3e0e59966db1cd297531.tar.bz2 chat-2b2ee62a1df0504fff3f3e0e59966db1cd297531.zip |
Merge pull request #1512 from rgarmsen2295/plt-995b
PLT-995 Applies name display preference setting in more places
Diffstat (limited to 'web/react/utils/utils.jsx')
-rw-r--r-- | web/react/utils/utils.jsx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 0c08c2df6..aa9146183 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -981,13 +981,15 @@ export function displayUsername(userId) { const nameFormat = PreferenceStore.getPreference(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', {value: 'false'}).value; let username = ''; - if (nameFormat === 'nickname_full_name') { - username = user.nickname || getFullName(user); - } else if (nameFormat === 'full_name') { - username = getFullName(user); - } - if (!username.trim().length) { - username = user.username; + if (user) { + if (nameFormat === 'nickname_full_name') { + username = user.nickname || getFullName(user); + } else if (nameFormat === 'full_name') { + username = getFullName(user); + } + if (!username.trim().length) { + username = user.username; + } } return username; |