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

Scripts: in `WP_Scripts::set_group()`, the `args` prop of the `_WP_Dependency` instance defaults to `null` - check that it is set before comparing. 

Props tivnet, chriscct7.
Fixes #25462.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-10-06 13:54:25 +00:00
parent c5475fbfc2
commit a3e36194fd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class.wp-scripts.php
View File

@ -247,7 +247,7 @@ class WP_Scripts extends WP_Dependencies {
* @return bool Not already in the group or a lower group * @return bool Not already in the group or a lower group
*/ */
public function set_group( $handle, $recursion, $group = false ) { public function set_group( $handle, $recursion, $group = false ) {
if ( $this->registered[$handle]->args === 1 ) if ( isset( $this->registered[$handle]->args ) && $this->registered[$handle]->args === 1 )
$grp = 1; $grp = 1;
else else
$grp = (int) $this->get_data( $handle, 'group' ); $grp = (int) $this->get_data( $handle, 'group' );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34861'; $wp_version = '4.4-alpha-34862';
/** /**
* 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.