diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-11-24 09:08:46 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-11-24 09:08:46 -0500 |
| commit | c96ecae6da31aceabf29586cde872876b81d11d9 (patch) | |
| tree | 94df09df540da846bb4c6ed50e8bd7879cff63ba /webapp/components/rhs_root_post.jsx | |
| parent | b212acf312ad640455fa715427ac19e6930dc61d (diff) | |
| parent | 36f62c9e82350f58c902f64a5d3304872431ad41 (diff) | |
| download | chat-c96ecae6da31aceabf29586cde872876b81d11d9.tar.gz chat-c96ecae6da31aceabf29586cde872876b81d11d9.tar.bz2 chat-c96ecae6da31aceabf29586cde872876b81d11d9.zip | |
Merge branch 'release-3.5'
Diffstat (limited to 'webapp/components/rhs_root_post.jsx')
| -rw-r--r-- | webapp/components/rhs_root_post.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx index 0dae5976f..22795967a 100644 --- a/webapp/components/rhs_root_post.jsx +++ b/webapp/components/rhs_root_post.jsx @@ -90,7 +90,7 @@ export default class RhsRootPost extends React.Component { var isOwner = this.props.currentUser.id === post.user_id; var isAdmin = TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser(); const isSystemMessage = post.type && post.type.startsWith(Constants.SYSTEM_MESSAGE_PREFIX); - var timestamp = user.update_at; + var timestamp = user ? user.update_at : 0; var channel = ChannelStore.get(post.channel_id); const flagIcon = Constants.FLAG_ICON_SVG; |