From 189e833139c0b6119ae9eff21bbb131f47accef0 Mon Sep 17 00:00:00 2001 From: nacin Date: Tue, 10 Jul 2012 21:26:35 +0000 Subject: [PATCH] Admin bar: When calling add_node() for an existing node, all properties should be merged into the existing arguments, including individual meta arguments. Corrects a logic inversion. fixes #21117. git-svn-id: http://core.svn.wordpress.org/trunk@21259 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-admin-bar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php index 53cc12831..b6f999381 100644 --- a/wp-includes/class-wp-admin-bar.php +++ b/wp-includes/class-wp-admin-bar.php @@ -112,7 +112,7 @@ class WP_Admin_Bar { $defaults = get_object_vars( $maybe_defaults ); // Do the same for 'meta' items. - if ( ! empty( $defaults['meta'] ) && empty( $args['meta'] ) ) + if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) ) $args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] ); $args = wp_parse_args( $args, $defaults );