WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
nacin 2012-07-10 21:26:35 +00:00
parent ebd7e61ac9
commit 189e833139
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class-wp-admin-bar.php
View File

@ -112,7 +112,7 @@ class WP_Admin_Bar {
$defaults = get_object_vars( $maybe_defaults ); $defaults = get_object_vars( $maybe_defaults );
// Do the same for 'meta' items. // 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['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
$args = wp_parse_args( $args, $defaults ); $args = wp_parse_args( $args, $defaults );