summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorStas Vovk <stas@vovk.me>2015-11-02 17:45:51 +0200
committerStas Vovk <stas@vovk.me>2015-11-02 17:45:51 +0200
commitbc57489d8b9786ae15374b93e0691488972af0a6 (patch)
tree95880dde652c497a0e8017774fd5d80f0c1147aa /web
parentb84af104557fa9d0a7270b62def9b7c567e23f9b (diff)
downloadchat-bc57489d8b9786ae15374b93e0691488972af0a6.tar.gz
chat-bc57489d8b9786ae15374b93e0691488972af0a6.tar.bz2
chat-bc57489d8b9786ae15374b93e0691488972af0a6.zip
fixed errors in displayUsername
Diffstat (limited to 'web')
-rw-r--r--web/react/utils/utils.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 259fe14cd..a9dafecdc 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -888,11 +888,11 @@ export function displayUsername(userId) {
const user = UserStore.getProfile(userId);
const nameFormat = PreferenceStore.getPreference(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', {value: 'false'}).value;
- let username;
+ let username = '';
if (nameFormat === 'nickname_full_name') {
- username = user.nickname || getFullName();
+ username = user.nickname || getFullName(user);
} else if (nameFormat === 'full_name') {
- username = getFullName();
+ username = getFullName(user);
}
if (!username.trim().length) {
username = user.username;