WordPress 4.2.3

[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 f02a6391a3943b660667ab1fc55cdc1acc711a29..b54259b472de1fddc6209197fb0e4e223f401440 100644 (file)
--- a/wp-includes/js/wp-emoji.js
+++ b/wp-includes/js/wp-emoji.js
@@ -70,13 +70,13 @@
                                                                node = node.parentNode;
                                                        }
 
-                                                       if ( ! node || ( node.className && node.className.indexOf( 'wp-exclude-emoji' ) !== -1 ) ) {
-                                                               continue;
-                                                       }
+                                                       if ( ! node || node.nodeType !== 1 || ( 'ownerSVGElement' in node ) ||
+                                                               ( node.className && typeof node.className === 'string' && node.className.indexOf( 'wp-exclude-emoji' ) !== -1 ) ) {
 
-                                                       if ( node && node.nodeType === 1 ) {
-                                                               parse( node );
-                                                       }
+                                                               continue;
+                                                       }
+
+                                                       parse( node );
                                                }
                                        }
                                } ).observe( document.body, {