X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fa11948979fd6a4ea5705dc613b239699a459db3..8d3bb1a5dcfdea9857d3c88c3751f09593e34dc8:/wp-includes/class.wp-dependencies.php diff --git a/wp-includes/class.wp-dependencies.php b/wp-includes/class.wp-dependencies.php index 158d3e03..03484181 100644 --- a/wp-includes/class.wp-dependencies.php +++ b/wp-includes/class.wp-dependencies.php @@ -1,14 +1,19 @@ queue : (array) $handles; $this->all_deps( $handles ); - foreach( $this->to_do as $key => $handle ) { + foreach ( $this->to_do as $key => $handle ) { if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) { - - /** - * A single item may alias a set of items, by having dependencies, - * but no source. Queuing the item queues the dependencies. - * - * Example: The extending class WP_Scripts is used to register 'scriptaculous' as a set of registered handles: - * add( 'scriptaculous', false, array( 'scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls' ) ); - * - * The src property is false. - **/ - if ( ! $this->registered[$handle]->src ) { - $this->done[] = $handle; - continue; - } - - /** + /* * Attempt to process the item. If successful, * add the handle to the done array. * @@ -130,7 +122,7 @@ class WP_Dependencies { } /** - * Process a dependency. + * Processes a dependency. * * @access public * @since 2.6.0 @@ -143,17 +135,19 @@ class WP_Dependencies { } /** - * Determine dependencies. + * Determines dependencies. * * Recursively builds an array of items to process taking * dependencies into account. Does NOT catch infinite loops. * * @access public * @since 2.1.0 + * @since 2.6.0 Moved from `WP_Scripts`. + * @since 2.8.0 Added the `$group` parameter. * - * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings). - * @param bool $recursion Internal flag that function is calling itself. - * @param mixed $group Group level: (int) level, (false) no groups. + * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings). + * @param bool $recursion Internal flag that function is calling itself. + * @param int|false $group Group level: (int) level, (false) no groups. * @return bool True on success, false on failure. */ public function all_deps( $handles, $recursion = false, $group = false ) { @@ -168,7 +162,8 @@ class WP_Dependencies { if ( in_array($handle, $this->done, true) ) // Already done 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 continue; @@ -178,7 +173,7 @@ class WP_Dependencies { $keep_going = false; // Item doesn't exist. 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. if ( ! $keep_going ) { // Either item or its dependencies don't exist. @@ -207,13 +202,17 @@ class WP_Dependencies { * * @access public * @since 2.1.0 - * - * @param string $handle Unique item name. - * @param string $src The item url. - * @param array $deps Optional. An array of item handle strings on which this item depends. - * @param string $ver Optional. Version (used for cache busting). - * @param mixed $args Optional. Custom property of the item. NOT the class property $args. Examples: $media, $in_footer. - * @return bool True on success, false on failure. + * @since 2.6.0 Moved from `WP_Scripts`. + * + * @param string $handle Name of the item. Should be unique. + * @param string $src Full URL of the item, or path of the item relative to the WordPress root directory. + * @param array $deps Optional. An array of registered item handles this item depends on. Default empty array. + * @param string|bool|null $ver Optional. String specifying item version number, if it has one, which is added to the URL + * as a query string for cache busting purposes. If version is set to false, a version + * number is automatically added equal to current installed WordPress version. + * If set to null, no version is added. + * @param mixed $args Optional. Custom property of the item. NOT the class property $args. Examples: $media, $in_footer. + * @return bool Whether the item has been registered. True on success, false on failure. */ public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) { if ( isset($this->registered[$handle]) ) @@ -269,6 +268,7 @@ class WP_Dependencies { * * @access public * @since 2.1.0 + * @since 2.6.0 Moved from `WP_Scripts`. * * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings). * @return void @@ -288,6 +288,7 @@ class WP_Dependencies { * * @access public * @since 2.1.0 + * @since 2.6.0 Moved from `WP_Scripts`. * * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings). */ @@ -310,6 +311,7 @@ class WP_Dependencies { * * @access public * @since 2.1.0 + * @since 2.6.0 Moved from `WP_Scripts`. * * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings). */ @@ -324,15 +326,41 @@ class WP_Dependencies { } } + /** + * Recursively search the passed dependency tree for $handle + * + * @since 4.0.0 + * + * @param array $queue An array of queued _WP_Dependency handle objects. + * @param string $handle Name of the item. Should be unique. + * @return bool Whether the handle is found after recursively searching the dependency tree. + */ + protected function recurse_deps( $queue, $handle ) { + foreach ( $queue as $queued ) { + if ( ! isset( $this->registered[ $queued ] ) ) { + continue; + } + + if ( in_array( $handle, $this->registered[ $queued ]->deps ) ) { + return true; + } elseif ( $this->recurse_deps( $this->registered[ $queued ]->deps, $handle ) ) { + return true; + } + } + + return false; + } + /** * Query list for an item. * * @access public * @since 2.1.0 + * @since 2.6.0 Moved from `WP_Scripts`. * * @param string $handle Name of the item. Should be unique. * @param string $list Property name of list array. - * @return bool Found, or object Item data. + * @return bool|_WP_Dependency Found, or object Item data. */ public function query( $handle, $list = 'registered' ) { switch ( $list ) { @@ -344,7 +372,10 @@ class WP_Dependencies { case 'enqueued' : case 'queue' : - return in_array( $handle, $this->queue ); + if ( in_array( $handle, $this->queue ) ) { + return true; + } + return $this->recurse_deps( $this->queue, $handle ); case 'to_do' : case 'to_print': // back compat @@ -371,15 +402,12 @@ 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 ( isset($this->groups[$handle]) && $this->groups[$handle] <= $group ) + if ( isset( $this->groups[ $handle ] ) && $this->groups[ $handle ] <= $group ) { return false; + } + + $this->groups[ $handle ] = $group; - $this->groups[$handle] = $group; return true; } @@ -401,7 +429,7 @@ class _WP_Dependency { * @since 2.6.0 * @var null */ - var $handle; + public $handle; /** * The handle source. @@ -410,7 +438,7 @@ class _WP_Dependency { * @since 2.6.0 * @var null */ - var $src; + public $src; /** * An array of handle dependencies. @@ -419,7 +447,7 @@ class _WP_Dependency { * @since 2.6.0 * @var array */ - var $deps = array(); + public $deps = array(); /** * The handle version. @@ -430,7 +458,7 @@ class _WP_Dependency { * @since 2.6.0 * @var bool|string */ - var $ver = false; + public $ver = false; /** * Additional arguments for the handle. @@ -439,7 +467,7 @@ class _WP_Dependency { * @since 2.6.0 * @var null */ - var $args = null; // Custom property, such as $in_footer or $media. + public $args = null; // Custom property, such as $in_footer or $media. /** * Extra data to supply to the handle. @@ -448,14 +476,14 @@ class _WP_Dependency { * @since 2.6.0 * @var array */ - var $extra = array(); + public $extra = array(); /** * Setup dependencies. * * @since 2.6.0 */ - function __construct() { + public function __construct() { @list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args(); if ( ! is_array($this->deps) ) $this->deps = array(); @@ -471,7 +499,7 @@ class _WP_Dependency { * @param mixed $data The data value to add. * @return bool False if not scalar, true otherwise. */ - function add_data( $name, $data ) { + public function add_data( $name, $data ) { if ( !is_scalar($name) ) return false; $this->extra[$name] = $data;