Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-24 13:54:59 +02:00
Code Issues Projects Releases Wiki Activity

Emoji: Add a comment to print_emoji_detection_script() explaining how the include statement works as part of the grunt build process.

Browse Source 
See #31701.


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


git-svn-id: http://core.svn.wordpress.org/trunk@31860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-03-25 04:09:26 +00:00
parent f5e6f92174
commit 1c6b1b3414
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/formatting.php
View File

@ -4156,6 +4156,16 @@ function print_emoji_detection_script() {
'concatemoji' => includes_url( "js/wp-emoji-release.min.js?$version" ),
);
/*
* If you're looking at a src version of this file, you'll see an "include"
* statement below. This is used by the `grunt build` process to directly
* include a minified version of wp-emoji-loader.js, instead of using the
* readfile() method from above.
*
* If you're looking at a build version of this file, you'll see a string of
* minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
* and edit wp-emoji-loader.js directly.
*/
?>
<script type="text/javascript">
window._wpemojiSettings = <?php echo wp_json_encode( $settings ); ?>;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta2-31880';
$wp_version = '4.2-beta2-31881';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.