X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..5aa86a9053fb0fa15846bb60aac2fb8fdfff524a:/wp-includes/class.wp-dependencies.php

diff --git a/wp-includes/class.wp-dependencies.php b/wp-includes/class.wp-dependencies.php
index ea607de2..3907082e 100644
--- a/wp-includes/class.wp-dependencies.php
+++ b/wp-includes/class.wp-dependencies.php
@@ -25,28 +25,21 @@ class WP_Dependencies {
 	var $groups = array();
 	var $group = 0;
 
-	function WP_Dependencies() {
-		$args = func_get_args();
-		call_user_func_array( array(&$this, '__construct'), $args );
-	}
-
-	function __construct() {}
-
 	/**
 	 * Do the dependencies
 	 *
 	 * Process the items passed to it or the queue.  Processes all dependencies.
 	 *
-	 * @param mixed handles (optional) items to be processed.  (void) processes queue, (string) process that item, (array of strings) process those items
+	 * @param mixed $handles (optional) items to be processed. (void) processes queue, (string) process that item, (array of strings) process those items
 	 * @return array Items that have been processed
 	 */
 	function do_items( $handles = false, $group = false ) {
-		// Print the queue if nothing is passed.  If a string is passed, print that script.  If an array is passed, print those scripts.
+		// Print the queue if nothing is passed. If a string is passed, print that script. If an array is passed, print those scripts.
 		$handles = false === $handles ? $this->queue : (array) $handles;
 		$this->all_deps( $handles );
 
 		foreach( $this->to_do as $key => $handle ) {
-			if ( !in_array($handle, $this->done) && isset($this->registered[$handle]) ) {
+			if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
 
 				if ( ! $this->registered[$handle]->src ) { // Defines a group.
 					$this->done[] = $handle;
@@ -72,9 +65,9 @@ class WP_Dependencies {
 	 *
 	 * Recursively builds array of items to process taking dependencies into account.  Does NOT catch infinite loops.
 	 *
-
-	 * @param mixed handles Accepts (string) dep name or (array of strings) dep names
-	 * @param bool recursion Used internally when function calls itself
+	 *
+	 * @param mixed $handles Accepts (string) dep name or (array of strings) dep names
+	 * @param bool $recursion Used internally when function calls itself
 	 */
 	function all_deps( $handles, $recursion = false, $group = false ) {
 		if ( !$handles = (array) $handles )
@@ -125,10 +118,10 @@ class WP_Dependencies {
 	 *
 	 * Adds the item only if no item of that name already exists
 	 *
-	 * @param string handle Script name
-	 * @param string src Script url
-	 * @param array deps (optional) Array of script names on which this script depends
-	 * @param string ver (optional) Script version (used for cache busting)
+	 * @param string $handle Script name
+	 * @param string $src Script url
+	 * @param array $deps (optional) Array of script names on which this script depends
+	 * @param string $ver (optional) Script version (used for cache busting)
 	 * @return array Hierarchical array of dependencies
 	 */
 	function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
@@ -141,17 +134,39 @@ class WP_Dependencies {
 	/**
 	 * Adds extra data
 	 *
-	 * Adds data only if script has already been added
+	 * Adds data only if script has already been added.
 	 *
-	 * @param string handle Script name
-	 * @param string data_name Name of object in which to store extra data
-	 * @param array data Array of extra data
+	 * @param string $handle Script name
+	 * @param string $key
+	 * @param mixed $value
 	 * @return bool success
 	 */
-	function add_data( $handle, $data_name, $data ) {
-		if ( !isset($this->registered[$handle]) )
+	function add_data( $handle, $key, $value ) {
+		if ( !isset( $this->registered[$handle] ) )
 			return false;
-		return $this->registered[$handle]->add_data( $data_name, $data );
+
+		return $this->registered[$handle]->add_data( $key, $value );
+	}
+
+	/**
+	 * Get extra data
+	 *
+	 * Gets data associated with a certain handle.
+	 *
+	 * @since WP 3.3
+	 *
+	 * @param string $handle Script name
+	 * @param string $key
+	 * @return mixed
+	 */
+	function get_data( $handle, $key ) {
+		if ( !isset( $this->registered[$handle] ) )
+			return false;
+
+		if ( !isset( $this->registered[$handle]->extra[$key] ) )
+			return false;
+
+		return $this->registered[$handle]->extra[$key];
 	}
 
 	function remove( $handles ) {
@@ -228,7 +243,7 @@ class _WP_Dependency {
 
 	var $extra = array();
 
-	function _WP_Dependency() {
+	function __construct() {
 		@list($this->handle, $this->src, $this->deps, $this->ver, $this->args) = func_get_args();
 		if ( !is_array($this->deps) )
 			$this->deps = array();