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

Load json2.js only in IE7 and older. Fixes #31276. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@31507 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-02-23 23:04:24 +00:00
parent e89d237b86
commit 481889c40b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/script-loader.php
View File

@ -288,7 +288,8 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 );
$scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23');
$scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23' );
did_action( 'init' ) && $scripts->add_data( 'json2', 'conditional', 'lt IE 8' );
$scripts->add( 'underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.6.0', 1 );
$scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore','jquery' ), '1.1.2', 1 );

2
wp-includes/version.php
View File

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