From e94b808f3b79fb44a3b8849cc99e9f84962924bf Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Sun, 15 Mar 2015 00:16:47 +0000
Subject: [PATCH] Emoji: always export the methods in wp-emoji.js, even when
 dependencies are missing and we cannot initialize. See #31242.

git-svn-id: https://develop.svn.wordpress.org/trunk@31780 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/wp-emoji.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

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 {