Changeset 22286

Timestamp:

10/23/2012 08:32:12 PM (12 years ago)

Author:

ryan

Message:

Revert [21420] and [21481]. Accepting a string caused back compat problems including the possibility of revealing previously hidden circular dependencies resulting in infinite loops.

fixes #20683 #22111
see #21520

File:

• trunk/wp-includes/class.wp-dependencies.php (modified) (1 diff)

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

@@ -248 +248 @@
 
     function __construct() {
-        @list($this->handle, $this->src, $this->deps, $this->ver, $this->args) = func_get_args();
-        if ( is_string( $this->deps ) && ! empty( $this->deps ) )
-            $this->deps = array( $this->deps );
-        elseif ( !is_array( $this->deps ) )
+        @list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args();
+        if ( ! is_array($this->deps) )
             $this->deps = array();
     }