diff --git a/src/wp-includes/js/wp-emoji.js b/src/wp-includes/js/wp-emoji.js index 726f455f4e..4fce566fad 100644 --- a/src/wp-includes/js/wp-emoji.js +++ b/src/wp-includes/js/wp-emoji.js @@ -154,21 +154,19 @@ } ); } - if ( ! twemoji || ! settings ) { - return; - } - /** * Initialize our emoji support, and set up listeners. */ - parseAllEmoji = ! browserSupportsEmoji(); - parseFlags = ! browserSupportsEmoji( 'flag' ); - parseEmoji = parseAllEmoji || parseFlags; - - if ( window.addEventListener ) { - window.addEventListener( 'load', load, false ); - } else if ( window.attachEvent ) { - window.attachEvent( 'onload', load ); + if ( twemoji && settings ) { + parseAllEmoji = ! browserSupportsEmoji(); + parseFlags = ! browserSupportsEmoji( 'flag' ); + parseEmoji = parseAllEmoji || parseFlags; + + if ( window.addEventListener ) { + window.addEventListener( 'load', load, false ); + } else if ( window.attachEvent ) { + window.attachEvent( 'onload', load ); + } } return {