Changeset 11058

Timestamp:

04/22/2009 09:01:36 PM (15 years ago)

Author:

azaozz

Message:

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

Location:

trunk/wp-includes

Files:

• class.wp-dependencies.php (modified) (2 diffs)
• class.wp-scripts.php (modified) (1 diff)

trunk/wp-includes/class.wp-dependencies.php

@@ -84 +84 @@
             $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;
@@ -110 +108 @@
                     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;

trunk/wp-includes/class.wp-scripts.php

@@ -147 +147 @@
             $grp = $group;
 
-        parent::set_group( $handle, $recursion, $grp );
+        return parent::set_group( $handle, $recursion, $grp );
     }