summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-12-08 08:14:53 -0500
committerJoram Wilander <jwawilander@gmail.com>2015-12-08 08:14:53 -0500
commitc67c937388309752231a90824876ddc269debebb (patch)
tree03113d455a1b4ca5ee69a1dfe3729f386d87f75c
parenteb465501f919bf425b9390b9587a84b3651953de (diff)
parent760f49d924540af31a422103b6df2e6bc4df612b (diff)
downloadchat-c67c937388309752231a90824876ddc269debebb.tar.gz
chat-c67c937388309752231a90824876ddc269debebb.tar.bz2
chat-c67c937388309752231a90824876ddc269debebb.zip
Merge pull request #1640 from florianorben/collapse_fix
fix a typo that was breaking combination of sequential messages
-rw-r--r--web/react/components/posts_view.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/posts_view.jsx b/web/react/components/posts_view.jsx
index 740ce04f6..b7ac92672 100644
--- a/web/react/components/posts_view.jsx
+++ b/web/react/components/posts_view.jsx
@@ -103,7 +103,7 @@ export default class PostsView extends React.Component {
const prevPostIsComment = Utils.isComment(prevPost);
const postFromWebhook = Boolean(post.props && post.props.from_webhook);
const prevPostFromWebhook = Boolean(prevPost.props && prevPost.props.from_webhook);
- const prevPostUserId = Utils.isSystemMessage(prevPost) ? '' : prevPostUserId;
+ const prevPostUserId = Utils.isSystemMessage(prevPost) ? '' : prevPost.user_id;
let prevWebhookName = '';
if (prevPost.props && prevPost.props.override_username) {
prevWebhookName = prevPost.props.override_username;