From 5a547231b7ca95da54b73913b609c30505aa9295 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Thu, 9 Apr 2015 11:07:28 +0000
Subject: [PATCH] Emoji: The emoji JS files should be run through the
 `script_loader_src` filter, as they would be if they were registered scripts.

Props peterwilsoncc.

Fixes #31938.


Built from https://develop.svn.wordpress.org/trunk@32097


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

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index f52a4b5393..793c6383ad 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -4141,8 +4141,10 @@ function print_emoji_detection_script() {
 
 	if ( SCRIPT_DEBUG ) {
 		$settings['source'] = array(
-			'wpemoji' => includes_url( "js/wp-emoji.js?$version" ),
-			'twemoji' => includes_url( "js/twemoji.js?$version" ),
+			/** 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' ),
+			/** This filter is documented in wp-includes/class.wp-scripts.php */
+			'twemoji' => apply_filters( 'script_loader_src', includes_url( "js/twemoji.js?$version" ), 'twemoji' ),
 		);
 
 		?>
@@ -4153,7 +4155,8 @@ function print_emoji_detection_script() {
 		<?php
 	} else {
 		$settings['source'] = array(
-			'concatemoji' => includes_url( "js/wp-emoji-release.min.js?$version" ),
+			/** This filter is documented in wp-includes/class.wp-scripts.php */
+			'concatemoji' => apply_filters( 'script_loader_src', includes_url( "js/wp-emoji-release.min.js?$version" ), 'concatemoji' ),
 		);
 
 		/*
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2d6b15e7a3..7779c77c08 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32096';
+$wp_version = '4.2-beta4-32097';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.