Ticket #34640: 34640.2.diff

src/wp-includes/js/twemoji.js

@@ -386 +386 @@
           );
           if (src) {
             img = new Image();
-            img.onerror = twemoji.onerror;
+            img.onerror = options.onerror;
             img.setAttribute('draggable', 'false');
             attrib = options.attributes(icon, variant);
             for (attrname in attrib) {
@@ -550 +550 @@
       base:       typeof how.base === 'string' ? how.base : twemoji.base,
       ext:        how.ext || twemoji.ext,
       size:       how.folder || toSizeSquaredAsset(how.size || twemoji.size),
-      className:  how.className || twemoji.className
+      className:  how.className || twemoji.className,
+      onerror:    how.onerror || twemoji.onerror
     });
   }
 

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

@@ -58 +58 @@
                                                         ii === 1 && removedNodes.length === 1 &&
                                                         addedNodes[0].nodeType === 3 &&
                                                         removedNodes[0].nodeName === 'IMG' &&
-                                                        addedNodes[0].data === removedNodes[0].alt
+                                                        addedNodes[0].data === removedNodes[0].alt &&
+                                                        'load-failed' === removedNodes[0].getAttribute( 'data-error' )
                                                 ) {
                                                         return;
                                                 }
@@ -155 +156 @@
                                         }
 
                                         return ''.concat( options.base, icon, options.ext );
+                                },
+                                onerror: function() {
+                                        if ( twemoji.parentNode ) {
+                                                this.setAttribute( 'data-error', 'load-failed' );
+                                                twemoji.parentNode.replaceChild( document.createTextNode( twemoji.alt ), twemoji );
+                                        }
                                 }
                         };