From 17dc928316442140528fa1444637e8a4d050eea1 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Thu, 10 Mar 2016 05:08:10 +0000
Subject: [PATCH] Emoji: Twemoji replacements weren't working in TinyMCE after
 [36816].

See #35300.



git-svn-id: https://develop.svn.wordpress.org/trunk@36927 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js b/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js
index e197187007..ea6a62996c 100644
--- a/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js
@@ -1,4 +1,4 @@
-( function( tinymce, wp ) {
+( function( tinymce, wp, settings ) {
 	tinymce.PluginManager.add( 'wpemoji', function( editor ) {
 		var typing,
 			env = tinymce.Env,
@@ -14,7 +14,7 @@
 				return false;
 			}());
 
-		if ( ! wp || ! wp.emoji || ! wp.emoji.replaceEmoji ) {
+		if ( ! wp || ! wp.emoji || settings.supports.everything ) {
 			return;
 		}
 
@@ -125,4 +125,4 @@
 			}
 		} );
 	} );
-} )( window.tinymce, window.wp );
+} )( window.tinymce, window.wp, window._wpemojiSettings );