From 194d266afb217382bdc3b4ae525b3c6939b035ca Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Mon, 1 Jun 2015 18:24:12 +0000 Subject: [PATCH] Emoji: make sure we parse only strings or DOM nodes that have children. Props peterwilsoncc. Fixes #32300. git-svn-id: https://develop.svn.wordpress.org/trunk@32679 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/wp-emoji.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/wp-includes/js/wp-emoji.js b/src/wp-includes/js/wp-emoji.js index 3b1a211be0..7447a39cab 100644 --- a/src/wp-includes/js/wp-emoji.js +++ b/src/wp-includes/js/wp-emoji.js @@ -120,7 +120,9 @@ * @param {Object} args Additional options for Twemoji. */ function parse( object, args ) { - if ( ! replaceEmoji || ! twemoji ) { + if ( ! replaceEmoji || ! twemoji || ! object || + ( 'string' !== typeof object && ( ! object.childNodes || ! object.childNodes.length ) ) ) { + return object; }