Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

In wp_print_scripts(), bail if $handles is false and the $wp_scripts global has not been instantiated.

Browse Source 
See [31192], #20513.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31174 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-01-16 02:28:22 +00:00
parent 74a8d68bbf
commit 2849a791b4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/functions.wp-scripts.php
View File

@ -74,9 +74,13 @@ function wp_print_scripts( $handles = false ) {
wp_scripts_maybe_doing_it_wrong( __FUNCTION__ ); wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
if ( ! $handles ) { global $wp_scripts;
return array(); // No need to instantiate if nothing is there. if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
if ( ! $handles ) {
return array(); // No need to instantiate if nothing is there.
}
} }
return wp_scripts()->do_items( $handles ); return wp_scripts()->do_items( $handles );
} }

2
wp-includes/version.php
View File

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