--- a/wp/wp-includes/class-wp-admin-bar.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-includes/class-wp-admin-bar.php Tue Jun 09 03:35:32 2015 +0200
@@ -16,11 +16,10 @@
switch ( $name ) {
case 'proto' :
return is_ssl() ? 'https://' : 'http://';
- break;
+
case 'menu' :
_deprecated_argument( 'WP_Admin_Bar', '3.3', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.' );
return array(); // Sorry, folks.
- break;
}
}
@@ -81,13 +80,17 @@
/**
* Add a node to the menu.
*
- * @param array $args - The arguments for each node.
- * - id - string - The ID of the item.
- * - title - string - The title of the node.
- * - parent - string - The ID of the parent node. Optional.
- * - href - string - The link for the item. Optional.
- * - group - boolean - If the node is a group. Optional. Default false.
- * - meta - array - Meta data including the following keys: html, class, onclick, target, title, tabindex.
+ * @param array $args {
+ * Arguments for adding a node.
+ *
+ * @type string $id ID of the item.
+ * @type string $title Title of the node.
+ * @type string $parent Optional. ID of the parent node.
+ * @type string $href Optional. Link for the item.
+ * @type bool $group Optional. Whether or not the node is a group. Default false.
+ * @type array $meta Meta data including the following keys: 'html', 'class', 'rel',
+ * 'onclick', 'target', 'title', 'tabindex'. Default empty.
+ * }
*/
public function add_node( $args ) {
// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
@@ -187,10 +190,14 @@
*
* @since 3.3.0
*
- * @param array $args - The arguments for each node.
- * - id - string - The ID of the item.
- * - parent - string - The ID of the parent node. Optional. Default root.
- * - meta - array - Meta data including the following keys: class, onclick, target, title.
+ * @param array $args {
+ * Array of arguments for adding a group.
+ *
+ * @type string $id ID of the item.
+ * @type string $parent Optional. ID of the parent node. Default 'root'.
+ * @type array $meta Meta data for the group including the following keys:
+ * 'class', 'onclick', 'target', and 'title'.
+ * }
*/
final public function add_group( $args ) {
$args['group'] = true;
@@ -356,9 +363,11 @@
}
?>
- <div id="wpadminbar" class="<?php echo $class; ?>" role="navigation">
- <a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e('Skip to toolbar'); ?></a>
- <div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e('Top navigation toolbar.'); ?>" tabindex="0">
+ <div id="wpadminbar" class="<?php echo $class; ?>">
+ <?php if ( ! is_admin() ) { ?>
+ <a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e( 'Skip to toolbar' ); ?></a>
+ <?php } ?>
+ <div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e( 'Toolbar' ); ?>" tabindex="0">
<?php foreach ( $root->children as $group ) {
$this->_render_group( $group );
} ?>
@@ -438,6 +447,9 @@
if ( ! empty( $node->meta['title'] ) ) :
?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
endif;
+ if ( ! empty( $node->meta['rel'] ) ) :
+ ?> rel="<?php echo esc_attr( $node->meta['rel'] ); ?>"<?php
+ endif;
?>><?php
else:
?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
@@ -482,6 +494,7 @@
add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_item', 7 );
// Site related.
+ add_action( 'admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0 );
add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );