Queue all default scripts for the head when a custom script lists them as dependencies, fixes WordPress#9620

azaozz · azaozz · commit bb93b6bab43b · 2009-04-22T21:01:36.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@11058 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/class.wp-dependencies.php b/wp-includes/class.wp-dependencies.php
@@ -83,18 +83,16 @@ function all_deps( $handles, $recursion = false, $group = false ) {
 		foreach ( $handles as $handle ) {
 			$handle_parts = explode('?', $handle);
 			$handle = $handle_parts[0];
+			$queued = in_array($handle, $this->to_do, true);
 
 			if ( in_array($handle, $this->done, true) ) // Already done
 				continue;
 
-			$this->set_group( $handle, $recursion, $group );
-
-			if ( in_array($handle, $this->to_do, true) ) // Already grobbed it and its deps
+			$moved = $this->set_group( $handle, $recursion, $group );
+			
+			if ( $queued && !$moved ) // already queued and in the right group
 				continue;
 
-			if ( isset($handle_parts[1]) )
-				$this->args[$handle] = $handle_parts[1];
-
 			$keep_going = true;
 			if ( !isset($this->registered[$handle]) )
 				$keep_going = false; // Script doesn't exist
@@ -110,6 +108,12 @@ function all_deps( $handles, $recursion = false, $group = false ) {
 					continue; // We're at the top level.  Move on to the next one.
 			}
 
+			if ( $queued ) // Already grobbed it and its deps
+				continue;
+
+			if ( isset($handle_parts[1]) )
+				$this->args[$handle] = $handle_parts[1];
+
 			$this->to_do[] = $handle;
 		}
 
diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
@@ -146,7 +146,7 @@ function set_group( $handle, $recursion, $group = false ) {
 		if ( false !== $group && $grp > $group )
 			$grp = $group;
 
-		parent::set_group( $handle, $recursion, $grp );
+		return parent::set_group( $handle, $recursion, $grp );
 	}
 
 	function all_deps( $handles, $recursion = false, $group = false ) {

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ function set_group( $handle, $recursion, $group = false ) {`
`146`	`146`	`if ( false !== $group && $grp > $group )`
`147`	`147`	`$grp = $group;`
`148`	`148`
`149`		`- parent::set_group( $handle, $recursion, $grp );`
	`149`	`+ return parent::set_group( $handle, $recursion, $grp );`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`function all_deps( $handles, $recursion = false, $group = false ) {`