fix text rendering of non-existent emoji when post metadata is enabled (

mattermost#2143)
JayaKrishnaNamburu · Dec 6, 2018 · c0a6494 · c0a6494
1 parent b1d2f1d
commit c0a6494
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/components/post_emoji/index.jsx b/components/post_emoji/index.jsx
@@ -12,6 +12,7 @@ import {getEmojiMap} from 'selectors/emojis';
 import PostEmoji from './post_emoji.jsx';
 
 function mapStateToProps(state, ownProps) {
+ const config = getConfig(state);
  const emojiMap = getEmojiMap(state);
  const emoji = emojiMap.get(ownProps.name);
 
@@ -21,7 +22,8 @@ function mapStateToProps(state, ownProps) {
  imageUrl = getEmojiImageUrl(emoji);
  } else {
  displayTextOnly = state.entities.emojis.nonExistentEmoji.has(ownProps.name) ||
- getConfig(state).EnableCustomEmoji !== 'true' ||
+ config.EnableCustomEmoji !== 'true' ||
+ config.ExperimentalEnablePostMetadata === 'true' ||
  getCurrentUserId(state) === '';
  }