Changeset 14154

Timestamp:

04/18/2010 03:32:39 PM (16 years ago)

Author:

nacin

Message:

Use wp_parse_args in register_sidebar. fixes #11836, props scribu.

File:

• trunk/wp-includes/widgets.php (modified) (3 diffs)

trunk/wp-includes/widgets.php

@@ -535 +535 @@
  * @since 2.2.0
  * @uses $wp_registered_sidebars Stores the new sidebar in this array by sidebar ID.
- * @uses parse_str() Converts a string to an array to be used in the rest of the function.
- * @usedby register_sidebars()
  *
  * @param string|array $args Builds Sidebar based off of 'name' and 'id' values
@@ -543 +541 @@
 function register_sidebar($args = array()) {
     global $wp_registered_sidebars;
-
-    if ( is_string($args) )
-        parse_str($args, $args);
 
     $i = count($wp_registered_sidebars) + 1;
@@ -559 +554 @@
     );
 
-    $sidebar = array_merge($defaults, (array) $args);
+    $sidebar = wp_parse_args( $args, $defaults );
 
     $wp_registered_sidebars[$sidebar['id']] = $sidebar;