diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-06-21 16:41:02 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-06-21 16:41:02 +0000 |
| commit | a5fe68e002632c190ffbd85167671ed4d4961135 (patch) | |
| tree | ae57f94603111507c50cb3c212a03bedf8f7dc5a /wp-includes/classes.php | |
| parent | 4e38776b5b68c61a4593a84340f4654200f7568e (diff) | |
| download | wordpress-mu-a5fe68e002632c190ffbd85167671ed4d4961135.tar.gz wordpress-mu-a5fe68e002632c190ffbd85167671ed4d4961135.tar.xz wordpress-mu-a5fe68e002632c190ffbd85167671ed4d4961135.zip | |
WP Merge to WP 2.2.1
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1005 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/classes.php')
| -rw-r--r-- | wp-includes/classes.php | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/wp-includes/classes.php b/wp-includes/classes.php index 3ca1926..dd05256 100644 --- a/wp-includes/classes.php +++ b/wp-includes/classes.php @@ -506,7 +506,7 @@ class Walker_Page extends Walker { function start_el($output, $page, $depth, $current_page, $args) { if ( $depth ) $indent = str_repeat("\t", $depth); - extract($args); + extract($args, EXTR_SKIP); $css_class = 'page_item'; $_current_page = get_page( $current_page ); if ( $page->ID == $current_page ) @@ -687,14 +687,16 @@ class WP_Ajax_Response { // a WP_Error object can be passed in 'id' or 'data' function add( $args = '' ) { - $defaults = array( - 'what' => 'object', 'action' => false, - 'id' => '0', 'old_id' => false, - 'data' => '', 'supplemental' => array() - ); - - $r = wp_parse_args( $args, $defaults ); - extract( $r ); + 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, EXTR_SKIP); if ( is_wp_error($id) ) { $data = $id; |