diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-11-23 17:14:13 -0800 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-12-01 08:21:58 -0800 |
commit | 478af4bf7501404ab53dd9afe981b26721682834 (patch) | |
tree | a0834c381d38f9035c99912397bfb8cc41a00226 /web/react/utils/utils.jsx | |
parent | 62c96514bfa243029dba2d9b47b5b8a8322059e4 (diff) | |
download | chat-478af4bf7501404ab53dd9afe981b26721682834.tar.gz chat-478af4bf7501404ab53dd9afe981b26721682834.tar.bz2 chat-478af4bf7501404ab53dd9afe981b26721682834.zip |
Enabled name display settings 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; |