diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-02-24 08:10:55 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-02-24 08:10:55 -0500 |
commit | 940b706ac8a790db9f089e000489d89426915fc9 (patch) | |
tree | 87ef0bccd65578d1867a6a330ae38a87910fd54a /web/react/components/rhs_thread.jsx | |
parent | 52767d9dcdc84fca4cd7a5b5c7ece2650691b91d (diff) | |
parent | ab72afdeabf0f93bc0bb9e4e9a124114b6baaac1 (diff) | |
download | chat-940b706ac8a790db9f089e000489d89426915fc9.tar.gz chat-940b706ac8a790db9f089e000489d89426915fc9.tar.bz2 chat-940b706ac8a790db9f089e000489d89426915fc9.zip |
Merge pull request #2239 from mattermost/rhs-fix
Fix profiles issue with RHS
Diffstat (limited to 'web/react/components/rhs_thread.jsx')
-rw-r--r-- | web/react/components/rhs_thread.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/web/react/components/rhs_thread.jsx b/web/react/components/rhs_thread.jsx index 975a39171..d007dd47f 100644 --- a/web/react/components/rhs_thread.jsx +++ b/web/react/components/rhs_thread.jsx @@ -109,6 +109,7 @@ export default class RhsThread extends React.Component { render() { const posts = this.state.posts; const selected = this.state.selected; + const profiles = this.state.profiles || {}; if (posts == null || selected == null) { return ( @@ -162,7 +163,7 @@ export default class RhsThread extends React.Component { if (UserStore.getCurrentId() === selected.user_id) { profile = UserStore.getCurrentUser(); } else { - profile = this.state.profiles[selected.user_id]; + profile = profiles[selected.user_id]; } return ( @@ -187,7 +188,7 @@ export default class RhsThread extends React.Component { if (UserStore.getCurrentId() === selected.user_id) { p = UserStore.getCurrentUser(); } else { - p = this.state.profiles[selected.user_id]; + p = profiles[selected.user_id]; } return ( <Comment |