Ticket #31242: 31242.14.patch

src/wp-includes/js/twemoji.js

@@ -1 +1 @@
 /*jslint indent: 2, browser: true, bitwise: true, plusplus: true */
-var twemoji;
-twemoji = (function (
+var twemoji = (function (
   /*! Copyright Twitter Inc. and other contributors. Licensed under MIT *//*
     https://github.com/twitter/twemoji/blob/gh-pages/LICENSE
   */
@@ -327 +326 @@
     var
       allText = grabAllTextNodes(node, []),
       length = allText.length,
+      modified = false,
       fragment,
       subnode,
       text,
@@ -367 +367 @@
             img.setAttribute('draggable', 'false');
             img.alt = alt;
             img.src = src;
+            modified = true;
+            fragment.appendChild(img);
           }
         }
-        fragment.appendChild(img || createText(alt));
+        if (!img) fragment.appendChild(createText(alt));
+        img = null;
       }
       // is there actually anything to replace in here ?
-      if (img) {
-        img = null;
+      if (modified) {
         // any text left to be added ?
         if (i < text.length) {
           fragment.appendChild(
@@ -516 +518 @@
     return r.join(sep || '-');
   }
 
-}());
+}());
+ No newline at end of file

src/wp-includes/script-loader.php

@@ -424 +424 @@
         $scripts->add( 'media-audiovideo', "/wp-includes/js/media/audio-video$suffix.js", array( 'media-editor' ), false, 1 );
         $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models', 'media-audiovideo', 'wp-playlist' ), false, 1 );
 
-        $scripts->add( 'twemoji', "/wp-includes/js/twemoji$suffix.js", array(), false, 1 );
+        $scripts->add( 'twemoji', "/wp-includes/js/twemoji$suffix.js", array(), '1.3.0', 1 );
         $scripts->add( 'emoji', "/wp-includes/js/wp-emoji$suffix.js", array( 'twemoji' ), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'emoji', '_wpemojiSettings', array(
                 /**