From 826e2d8ea125a91c590477d530d5ab8947a54afa Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Sat, 20 Feb 2016 22:11:25 +0000
Subject: [PATCH] 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
---
 wp-includes/class.wp-dependencies.php | 9 +++++----
 wp-includes/version.php               | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/wp-includes/class.wp-dependencies.php b/wp-includes/class.wp-dependencies.php
index a0d68c97a3..2ba28b024b 100644
--- a/wp-includes/class.wp-dependencies.php
+++ b/wp-includes/class.wp-dependencies.php
@@ -384,10 +384,11 @@ class WP_Dependencies {
 	public function set_group( $handle, $recursion, $group ) {
 		$group = (int) $group;
 
-		if ( $recursion )
-			$group = min($this->group, $group);
-		else
-			$this->group = $group;
+		if ( $recursion ) {
+			$group = min( $this->group, $group );
+		}
+
+		$this->group = $group;
 
 		if ( isset($this->groups[$handle]) && $this->groups[$handle] <= $group )
 			return false;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 802d4340a0..a966aa0856 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.