Ticket #31242: 31242.12.patch

src/wp-includes/js/twemoji.js

@@ -370 +370 @@
           }
         }
         fragment.appendChild(img || createText(alt));
-        img = null;
       }
       // is there actually anything to replace in here ?
-      if (0 < i) {
+      if (img) {
+        img = null;
         // any text left to be added ?
         if (i < text.length) {
           fragment.appendChild(
@@ -516 +516 @@
     return r.join(sep || '-');
   }
 
-}());
- No newline at end of file
+}());

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

@@ -1 +1 @@
 window.wp = window.wp || {};
 
 ( function( window, wp, twemoji, settings ) {
+        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
+
         var emoji = {
                 /**
                  * Flag to determine if we should parse all emoji characters into Twemoji images.
@@ -68 +70 @@
                                                                 node = node.parentNode;
                                                         }
 
-                                                        if ( node.nodeType === 1 ) {
+                                                        if ( node && node.nodeType === 1 ) {
                                                                 emoji.parse( node );
                                                         }
                                                 }
@@ -95 +97 @@
                         var canvas = document.createElement( 'canvas' ),
                                 context = canvas.getContext && canvas.getContext( '2d' );
 
-                        if ( ! context.fillText ) {
+                        if ( ! context || ! context.fillText ) {
                                 return false;
                         }
 
@@ -123 +125 @@
                         var canvas = document.createElement( 'canvas' ),
                                 context = canvas.getContext && canvas.getContext( '2d' );
 
-                        if ( ! context.fillText ) {
+                        if ( ! context || ! context.fillText ) {
                                 return false;
                         }
 

src/wp-includes/script-loader.php

@@ -434 +434 @@
                  *
                  * @param string The emoji base URL.
                  */
-                'baseUrl' => apply_filters( 'emoji_url', '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72/' ),
+                'baseUrl' => apply_filters( 'emoji_url', '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72' ),
                 /**
                  * Filter the extension of the emoji files.
                  *