From 9ecaba26882c8ca6c8618c23744c422370cce2a2 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Sun, 10 May 2015 18:24:30 +0000
Subject: [PATCH] Check if running from /src or SCRIPT_DEBUG is defined in
 `print_emoji_detection_script()`. See #32118. Built from
 https://develop.svn.wordpress.org/trunk@32482

git-svn-id: http://core.svn.wordpress.org/trunk@32452 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/formatting.php | 3 ++-
 wp-includes/version.php    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index a2272659b5..9a2dce8637 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -4140,8 +4140,9 @@ function print_emoji_detection_script() {
 	);
 
 	$version = 'ver=' . $wp_version;
+	$develop_src = false !== strpos( $wp_version, '-src' );
 
-	if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+	if ( $develop_src || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ) {
 		$settings['source'] = array(
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
 			'wpemoji' => apply_filters( 'script_loader_src', includes_url( "js/wp-emoji.js?$version" ), 'wpemoji' ),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9888f7f9a7..4e961fbe13 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32481';
+$wp_version = '4.3-alpha-32482';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.