Changeset 5444 for trunk/wp-includes/classes.php

Timestamp:

05/11/2007 03:10:05 AM (19 years ago)

Author:

rob1n

Message:

Use wp_parse_args(). fixes #4237

File:

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

trunk/wp-includes/classes.php

@@ -688 +688 @@
         // a WP_Error object can be passed in 'id' or 'data'
         function add( $args = '' ) {
-                if ( is_array($args) )
-                        $r = &$args;
-                else
-                        parse_str($args, $r);
-
-                $defaults = array('what' => 'object', 'action' => false, 'id' => '0', 'old_id' => false,
-                                'data' => '', 'supplemental' => array());
-
-                $r = array_merge($defaults, $r);
-                extract($r);
+                $defaults = array(
+                        'what' => 'object', 'action' => false, 
+                        'id' => '0', 'old_id' => false, 
+                        'data' => '', 'supplemental' => array()
+                );
+                
+                $r = wp_parse_args( $args, $defaults );
+                extract( $r );
 
                 if ( is_wp_error($id) ) {