Changeset 36871 for trunk/src/wp-includes/class.wp-dependencies.php
- Timestamp:
- 03/06/2016 07:49:54 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/class.wp-dependencies.php
r36744 r36871 78 78 * @access public 79 79 * @since 2.8.0 80 * @deprecated 4.5.0 80 81 * @var int 81 82 */ … … 162 163 continue; 163 164 164 $moved = $this->set_group( $handle, $recursion, $group ); 165 $moved = $this->set_group( $handle, $recursion, $group ); 166 $new_group = $this->groups[ $handle ]; 165 167 166 168 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)) ) 173 175 $keep_going = false; // Item requires dependencies that don't exist. 174 elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $ group ) )176 elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) ) 175 177 $keep_going = false; // Item requires dependencies that don't exist. 176 178 … … 398 400 $group = (int) $group; 399 401 400 if ( $recursion ) { 401 $group = min( $this->group, $group ); 402 } 403 404 $this->group = $group; 405 406 if ( isset($this->groups[$handle]) && $this->groups[$handle] <= $group ) 407 return false; 408 409 $this->groups[$handle] = $group; 402 if ( isset( $this->groups[ $handle ] ) && $this->groups[ $handle ] <= $group ) { 403 return false; 404 } 405 406 $this->groups[ $handle ] = $group; 407 410 408 return true; 411 409 }
Note: See TracChangeset
for help on using the changeset viewer.