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

Script Loader: Fix missing script output when the groups of dependencies are different. 

Aka: Don't lose the grandchild.

Props gitlost, ocean90.
Fixes #35873.
Built from https://develop.svn.wordpress.org/trunk@36604


git-svn-id: http://core.svn.wordpress.org/trunk@36571 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-02-20 22:11:25 +00:00
parent a40a04ef42
commit 826e2d8ea1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/class.wp-dependencies.php
View File

@ -384,10 +384,11 @@ class WP_Dependencies {
public function set_group( $handle, $recursion, $group ) { public function set_group( $handle, $recursion, $group ) {
$group = (int) $group; $group = (int) $group;
if ( $recursion ) if ( $recursion ) {
$group = min($this->group, $group); $group = min( $this->group, $group );
else }
$this->group = $group;
$this->group = $group;
if ( isset($this->groups[$handle]) && $this->groups[$handle] <= $group ) if ( isset($this->groups[$handle]) && $this->groups[$handle] <= $group )
return false; return false;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-36603'; $wp_version = '4.5-alpha-36604';
/** /**
* 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.