WordPress 4.4.1-scripts

[autoinstalls/wordpress.git] / wp-includes / js / wp-emoji.js

diff --git a/wp-includes/js/wp-emoji.js b/wp-includes/js/wp-emoji.js
index f87e0839869d30cbb1790b7e9bb9e055cbca1ff5..6fa00c2e6fbfd177c94c02cf75604e1719189841 100644 (file)
--- a/wp-includes/js/wp-emoji.js
+++ b/wp-includes/js/wp-emoji.js
@@ -149,7 +149,7 @@
                                                        return false;
                                        }
 
-                                       if ( ! settings.supports.flag && settings.supports.simple && settings.supports.unicode8 &&
+                                       if ( ! settings.supports.flag && settings.supports.simple && settings.supports.unicode8 && settings.supports.diversity &&
                                                ! /^1f1(?:e[6-9a-f]|f[0-9a-f])-1f1(?:e[6-9a-f]|f[0-9a-f])$/.test( icon ) ) {
 
                                                return false;
@@ -178,7 +178,7 @@
                 * Initialize our emoji support, and set up listeners.
                 */
                if ( settings ) {
-                       replaceEmoji = ! settings.supports.simple || ! settings.supports.flag || ! settings.supports.unicode8;
+                       replaceEmoji = ! settings.supports.simple || ! settings.supports.flag || ! settings.supports.unicode8 || ! settings.supports.diversity;
 
                        if ( settings.DOMReady ) {
                                load();