Ticket #32128: 32128.diff

src/wp-includes/js/wp-emoji.js

@@ -96 +96 @@
                  * @param {Object} args Additional options for Twemoji.
                  */
                 function parse( object, args ) {
-                        if ( ! replaceEmoji ) {
+                        if ( ! replaceEmoji || object.className.indexOf( 'emoji' ) ) {
                                 return object;
                         }
 
@@ -143 +143 @@
                  * Initialize our emoji support, and set up listeners.
                  */
                 if ( settings ) {
-                        supportsEmoji = window._wpemojiSettings.supports.simple;
-                        supportsFlagEmoji = window._wpemojiSettings.supports.flag;
-                        replaceEmoji = ! supportsEmoji || ! supportsFlagEmoji;
+                        replaceEmoji = ! settings.supports.simple || ! settings.supports.flag;
 
                         if ( ( ! isIE8 && 'loading' === document.readyState ) || ( isIE8 && 'complete' !== document.readyState ) ) {
                                 if ( document.addEventListener ) {