WordPress.org

Make WordPress Core

Changeset 22286


Ignore:
Timestamp:
10/23/12 20:32:12 (18 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/class.wp-dependencies.php

    r21672 r22286  
    248248 
    249249    function __construct() { 
    250         @list($this->handle, $this->src, $this->deps, $this->ver, $this->args) = func_get_args(); 
    251         if ( is_string( $this->deps ) && ! empty( $this->deps ) ) 
    252             $this->deps = array( $this->deps ); 
    253         elseif ( !is_array( $this->deps ) ) 
     250        @list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args(); 
     251        if ( ! is_array($this->deps) ) 
    254252            $this->deps = array(); 
    255253    } 
Note: See TracChangeset for help on using the changeset viewer.