Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Gary Pendergast 2015-04-09 11:07:28 +00:00
parent dcf2710bc9
commit 5a547231b7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/formatting.php
View File

@ -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' ),
);
/*

2
wp-includes/version.php
View File

@ -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.