summaryrefslogtreecommitdiffstats
path: root/webapp/components/rhs_root_post.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-03-31 12:21:20 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-03-31 12:21:20 -0400
commit8050a9b958f72227dbf601c05f6bcdfe50141708 (patch)
tree4e3df4d2d0e09b1bbcdd5f11207e61368c0c07bf /webapp/components/rhs_root_post.jsx
parent8abd74b89222fb09a5bb3783037f27eeb86303fc (diff)
parent980419b37cb1a329cc694213b2648b5919e4902c (diff)
downloadchat-8050a9b958f72227dbf601c05f6bcdfe50141708.tar.gz
chat-8050a9b958f72227dbf601c05f6bcdfe50141708.tar.bz2
chat-8050a9b958f72227dbf601c05f6bcdfe50141708.zip
Merge pull request #2589 from mattermost/plt-1812
PLT-1812 Update webhook posts to never show in collapsed view
Diffstat (limited to 'webapp/components/rhs_root_post.jsx')
-rw-r--r--webapp/components/rhs_root_post.jsx2
1 files changed, 2 insertions, 0 deletions
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx
index 26b392aa1..7a7c5f692 100644
--- a/webapp/components/rhs_root_post.jsx
+++ b/webapp/components/rhs_root_post.jsx
@@ -217,6 +217,8 @@ export default class RhsRootPost extends React.Component {
if (post.props && post.props.from_webhook && global.window.mm_config.EnablePostIconOverride === 'true') {
if (post.props.override_icon_url) {
src = post.props.override_icon_url;
+ } else {
+ src = Constants.DEFAULT_WEBHOOK_LOGO;
}
} else if (Utils.isSystemMessage(post)) {
src = Constants.SYSTEM_MESSAGE_PROFILE_IMAGE;