Changeset 36871 for trunk/src/wp-includes/class.wp-dependencies.php

Timestamp:

03/06/2016 07:49:54 PM (9 years ago)

Author:

ocean90

Message:

Dependencies: Improve group processing of script dependencies.

This is a follow-up to [36604].

When processing dependencies $this->group will be the minimum of the script's registered group and all preceding siblings. This is wrong because only a scripts ancestors in the dependency chain should affect where it is loaded. Effectively $this->group introduced a form of global state which potentially corrupted the group of dependencies. Sorting covers up this problem.
The issue in #35873 was that script were not moving their dependencies to a lower group when necessary.

The fix:

• In WP_Dependencies::all_deps() pass the new $group value to WP_Dependencies::all_deps(). Previously the wrong value was passed because the parent script could have moved with WP_Scripts::set_group().
• In WP_Scripts::all_deps() pass the $group parameter to WP_Dependencies::all_deps() so it doesn't always use false for $group. Same for WP_Styles::all_deps().

Props stephenharris, gitlost.
Fixes #35956.

File:

• trunk/src/wp-includes/class.wp-dependencies.php (modified) (4 diffs)

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

@@ -78 +78 @@
      * @access public
      * @since 2.8.0
+     * @deprecated 4.5.0
      * @var int
      */
@@ -162 +163 @@
                 continue;
 
-            $moved = $this->set_group( $handle, $recursion, $group );
+            $moved     = $this->set_group( $handle, $recursion, $group );
+            $new_group = $this->groups[ $handle ];
 
             if ( $queued && !$moved ) // already queued and in the right group
@@ -172 +174 @@
             elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
                 $keep_going = false; // Item requires dependencies that don't exist.
-            elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $group ) )
+            elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) )
                 $keep_going = false; // Item requires dependencies that don't exist.
 
@@ -398 +400 @@
         $group = (int) $group;
 
-        if ( $recursion ) {
-            $group = min( $this->group, $group );
-        }
-
-        $this->group = $group;
-
-        if ( isset($this->groups[$handle]) && $this->groups[$handle] <= $group )
-            return false;
-
-        $this->groups[$handle] = $group;
+        if ( isset( $this->groups[ $handle ] ) && $this->groups[ $handle ] <= $group ) {
+            return false;
+        }
+
+        $this->groups[ $handle ] = $group;
+
         return true;
     }