diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-05-12 09:12:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 09:12:55 -0400 |
| commit | 1397798f1763b0848957a8672c8d40b6243764d5 (patch) | |
| tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/components/audit_table.jsx | |
| parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
| parent | 9d109b070037951fcd0832b785eba8a3db9a157c (diff) | |
| download | chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.gz chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.bz2 chat-1397798f1763b0848957a8672c8d40b6243764d5.zip | |
Merge pull request #6401 from mattermost/merge-3.9
Merge release-3.9 branch into master
Diffstat (limited to 'webapp/components/audit_table.jsx')
| -rw-r--r-- | webapp/components/audit_table.jsx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webapp/components/audit_table.jsx b/webapp/components/audit_table.jsx index 5d4bc4580..e07d6ca12 100644 --- a/webapp/components/audit_table.jsx +++ b/webapp/components/audit_table.jsx @@ -378,7 +378,10 @@ export function formatAuditInfo(audit, formatMessage) { if (userIdField.indexOf('user_id') >= 0) { userId = userIdField[userIdField.indexOf('user_id') + 1]; - username = UserStore.getProfile(userId).username; + var profile = UserStore.getProfile(userId); + if (profile) { + username = profile.username; + } } } |