From 7cee7b3342afa4b6845b0574f90c9fdc586c3c34 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 5 Sep 2017 19:20:47 -0500 Subject: PLT-7300: Add use_user_icon prop to allow bots to just use their user icon (#7381) * add use_user_icon prop to allow bots to just use their user icon * revert unintentional change --- webapp/utils/post_utils.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/utils') diff --git a/webapp/utils/post_utils.jsx b/webapp/utils/post_utils.jsx index d37e6c26d..670dfbaaf 100644 --- a/webapp/utils/post_utils.jsx +++ b/webapp/utils/post_utils.jsx @@ -39,7 +39,7 @@ export function getProfilePicSrcForPost(post, user) { src = Utils.imageURLForUser(post.user_id); } - if (post.props && post.props.from_webhook && global.window.mm_config.EnablePostIconOverride === 'true') { + if (post.props && post.props.from_webhook && !post.props.use_user_icon && global.window.mm_config.EnablePostIconOverride === 'true') { if (post.props.override_icon_url) { src = post.props.override_icon_url; } else { -- cgit v1.2.3-1-g7c22