Ticket #20683: 35841.patch

wp-includes/functions.wp-scripts.php

@@ -214 +214 @@
  *
  * @param string      $handle    Name of the script.
  * @param string|bool $src       Path to the script from the root directory of WordPress. Example: '/js/myscript.js'.
- * @param array       $deps      An array of registered handles this script depends on. Default empty array.
+ * @param array|string       $deps      An array of registered handles this script depends on. Default empty array.
  * @param string|bool $ver       Optional. String specifying the script version number, if it has one. This parameter
  *                               is used to ensure that the correct version is sent to the client regardless of caching,
  *                               and so should be included if a version number is available and makes sense for the script.

wp-includes/functions.wp-styles.php

@@ -144 +144 @@
  *
  * @param string      $handle Name of the stylesheet.
  * @param string|bool $src    Path to the stylesheet from the root directory of WordPress. Example: '/css/mystyle.css'.
- * @param array       $deps   An array of registered style handles this stylesheet depends on. Default empty array.
+ * @param array|string       $deps   An array of registered style handles this stylesheet depends on. Default empty array.
  * @param string|bool $ver    String specifying the stylesheet version number, if it has one. This parameter is used
  *                            to ensure that the correct version is sent to the client regardless of caching, and so
  *                            should be included if a version number is available and makes sense for the stylesheet.

wp-includes/class.wp-dependencies.php

@@ -210 +210 @@
          *
          * @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 array|string  $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 Whether the item has been registered. True on success, false on failure.
@@ -485 +485 @@
          */
         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();
+                if ( ! is_array( $this->deps ) ) {
+                        $this->deps = is_string( $this->deps ) ? array( $this->deps ) : array();
+                }
         }
 
         /**