/**
* Instantiate the admin bar object and set it up as a global for access elsewhere.
*
- * To hide the admin bar, you're looking in the wrong place. Unhooking this function will not
- * properly remove the admin bar. For that, use show_admin_bar(false) or the show_admin_bar filter.
+ * UNHOOKING THIS FUNCTION WILL NOT PROPERLY REMOVE THE ADMIN BAR.
+ * For that, use show_admin_bar(false) or the 'show_admin_bar' filter.
*
* @since 3.1.0
* @access private
require( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
/* Instantiate the admin bar */
+
+ /**
+ * Filter the admin bar class to instantiate.
+ *
+ * @since 3.1.0
+ *
+ * @param string $wp_admin_bar_class Admin bar class to use. Default 'WP_Admin_Bar'.
+ */
$admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
if ( class_exists( $admin_bar_class ) )
$wp_admin_bar = new $admin_bar_class;
return true;
}
-add_action( 'init', '_wp_admin_bar_init' ); // Don't remove. Wrong way to disable.
+// Don't remove. Wrong way to disable.
+add_action( 'template_redirect', '_wp_admin_bar_init', 0 );
+add_action( 'admin_init', '_wp_admin_bar_init' );
/**
* Render the admin bar to the page based on the $wp_admin_bar->menu member var.
if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
return false;
+ /**
+ * Load all necessary admin bar items.
+ *
+ * This is the hook used to add, remove, or manipulate admin bar items.
+ *
+ * @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance, passed by reference
+ */
do_action_ref_array( 'admin_bar_menu', array( &$wp_admin_bar ) );
+ /**
+ * Fires before the admin bar is rendered.
+ *
+ * @since 3.1.0
+ */
do_action( 'wp_before_admin_bar_render' );
$wp_admin_bar->render();
+ /**
+ * Fires after the admin bar is rendered.
+ *
+ * @since 3.1.0
+ */
do_action( 'wp_after_admin_bar_render' );
}
add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );
* Add the WordPress logo menu.
*
* @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_wp_menu( $wp_admin_bar ) {
$wp_admin_bar->add_menu( array(
) );
}
+/**
+ * Add the sidebar toggle button.
+ *
+ * @since 3.8.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
+ */
+function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
+ if ( is_admin() ) {
+ $wp_admin_bar->add_menu( array(
+ 'id' => 'menu-toggle',
+ 'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'Menu' ) . '</span>',
+ 'href' => '#',
+ ) );
+ }
+}
+
/**
* Add the "My Account" item.
*
* @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_my_account_item( $wp_admin_bar ) {
$user_id = get_current_user_id();
if ( ! $user_id )
return;
- $avatar = get_avatar( $user_id, 16 );
+ $avatar = get_avatar( $user_id, 26 );
$howdy = sprintf( __('Howdy, %1$s'), $current_user->display_name );
$class = empty( $avatar ) ? '' : 'with-avatar';
* Add the "My Account" submenu items.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
$user_id = get_current_user_id();
$user_info = get_avatar( $user_id, 64 );
$user_info .= "<span class='display-name'>{$current_user->display_name}</span>";
- if ( $current_user->display_name !== $current_user->user_nicename )
- $user_info .= "<span class='username'>{$current_user->user_nicename}</span>";
+ if ( $current_user->display_name !== $current_user->user_login )
+ $user_info .= "<span class='username'>{$current_user->user_login}</span>";
$wp_admin_bar->add_menu( array(
'parent' => 'user-actions',
* Add the "Site Name" menu.
*
* @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_site_menu( $wp_admin_bar ) {
- global $current_site;
-
// Don't show for logged out users.
if ( ! is_user_logged_in() )
return;
$blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
if ( is_network_admin() ) {
- $blogname = sprintf( __('Network Admin: %s'), esc_html( $current_site->site_name ) );
+ $blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) );
} elseif ( is_user_admin() ) {
- $blogname = sprintf( __('Global Dashboard: %s'), esc_html( $current_site->site_name ) );
+ $blogname = sprintf( __('Global Dashboard: %s'), esc_html( get_current_site()->site_name ) );
}
- $title = wp_html_excerpt( $blogname, 40 );
- if ( $title != $blogname )
- $title = trim( $title ) . '…';
+ $title = wp_html_excerpt( $blogname, 40, '…' );
$wp_admin_bar->add_menu( array(
'id' => 'site-name',
* Add the "My Sites/[Site Name]" menu and all submenus.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
- global $wpdb;
-
// Don't show for logged out users or single site mode.
if ( ! is_user_logged_in() || ! is_multisite() )
return;
) );
$wp_admin_bar->add_menu( array(
'parent' => 'network-admin',
- 'id' => 'network-admin-v',
- 'title' => __( 'Visit Network' ),
- 'href' => network_home_url(),
+ 'id' => 'network-admin-t',
+ 'title' => __( 'Themes' ),
+ 'href' => network_admin_url( 'themes.php' ),
+ ) );
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-p',
+ 'title' => __( 'Plugins' ),
+ 'href' => network_admin_url( 'plugins.php' ),
) );
}
),
) );
- $blue_wp_logo_url = includes_url('images/wpmini-blue.png');
-
foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
- // @todo Replace with some favicon lookup.
- //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $blue_wp_logo_url ) ) . '" alt="Blavatar" width="16" height="16" />';
- $blavatar = '<img src="' . esc_url($blue_wp_logo_url) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" class="blavatar"/>';
+ switch_to_blog( $blog->userblog_id );
+
+ $blavatar = '<div class="blavatar"></div>';
$blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
$menu_id = 'blog-' . $blog->userblog_id;
'parent' => 'my-sites-list',
'id' => $menu_id,
'title' => $blavatar . $blogname,
- 'href' => get_admin_url( $blog->userblog_id ),
+ 'href' => admin_url(),
) );
$wp_admin_bar->add_menu( array(
'parent' => $menu_id,
'id' => $menu_id . '-d',
'title' => __( 'Dashboard' ),
- 'href' => get_admin_url( $blog->userblog_id ),
+ 'href' => admin_url(),
) );
- if ( current_user_can_for_blog( $blog->userblog_id, 'edit_posts' ) ) {
+ if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
$wp_admin_bar->add_menu( array(
'parent' => $menu_id,
'id' => $menu_id . '-n',
'title' => __( 'New Post' ),
- 'href' => get_admin_url( $blog->userblog_id, 'post-new.php' ),
+ 'href' => admin_url( 'post-new.php' ),
) );
+ }
+
+ if ( current_user_can( 'edit_posts' ) ) {
$wp_admin_bar->add_menu( array(
'parent' => $menu_id,
'id' => $menu_id . '-c',
'title' => __( 'Manage Comments' ),
- 'href' => get_admin_url( $blog->userblog_id, 'edit-comments.php' ),
+ 'href' => admin_url( 'edit-comments.php' ),
) );
}
'parent' => $menu_id,
'id' => $menu_id . '-v',
'title' => __( 'Visit Site' ),
- 'href' => get_home_url( $blog->userblog_id, '/' ),
+ 'href' => home_url( '/' ),
) );
+
+ restore_current_blog();
}
}
* Provide a shortlink.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
$short = wp_get_shortlink( 0, 'query' );
* Provide an edit link for posts and terms.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_edit_menu( $wp_admin_bar ) {
- global $post, $tag, $wp_the_query;
+ global $tag, $wp_the_query;
if ( is_admin() ) {
$current_screen = get_current_screen();
+ $post = get_post();
if ( 'post' == $current_screen->base
&& 'add' != $current_screen->action
&& ( $post_type_object = get_post_type_object( $post->post_type ) )
- && current_user_can( $post_type_object->cap->read_post, $post->ID )
- && ( $post_type_object->public ) )
+ && current_user_can( 'read_post', $post->ID )
+ && ( $post_type_object->public )
+ && ( $post_type_object->show_in_admin_bar ) )
{
$wp_admin_bar->add_menu( array(
'id' => 'view',
if ( ! empty( $current_object->post_type )
&& ( $post_type_object = get_post_type_object( $current_object->post_type ) )
- && current_user_can( $post_type_object->cap->edit_post, $current_object->ID )
- && ( $post_type_object->show_ui || 'attachment' == $current_object->post_type ) )
+ && current_user_can( 'edit_post', $current_object->ID )
+ && $post_type_object->show_ui && $post_type_object->show_in_admin_bar )
{
$wp_admin_bar->add_menu( array(
'id' => 'edit',
* Add "Add New" menu.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
$actions = array();
$cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' );
- if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->edit_posts ) ) {
+ if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->create_posts ) )
$actions[ 'post-new.php' ] = array( $cpts['post']->labels->name_admin_bar, 'new-post' );
- unset( $cpts['post'] );
- }
- if ( current_user_can( 'upload_files' ) )
- $actions[ 'media-new.php' ] = array( _x( 'Media', 'add new from admin bar' ), 'new-media' );
+ if ( isset( $cpts['attachment'] ) && current_user_can( 'upload_files' ) )
+ $actions[ 'media-new.php' ] = array( $cpts['attachment']->labels->name_admin_bar, 'new-media' );
if ( current_user_can( 'manage_links' ) )
$actions[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
- if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->edit_posts ) ) {
+ if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->create_posts ) )
$actions[ 'post-new.php?post_type=page' ] = array( $cpts['page']->labels->name_admin_bar, 'new-page' );
- unset( $cpts['page'] );
- }
+
+ unset( $cpts['post'], $cpts['page'], $cpts['attachment'] );
// Add any additional custom post types.
foreach ( $cpts as $cpt ) {
- if ( ! current_user_can( $cpt->cap->edit_posts ) )
+ if ( ! current_user_can( $cpt->cap->create_posts ) )
continue;
$key = 'post-new.php?post_type=' . $cpt->name;
$actions[ $key ] = array( $cpt->labels->name_admin_bar, 'new-' . $cpt->name );
}
+ // Avoid clash with parent node and a 'content' post type.
+ if ( isset( $actions['post-new.php?post_type=content'] ) )
+ $actions['post-new.php?post_type=content'][1] = 'add-new-content';
if ( current_user_can( 'create_users' ) || current_user_can( 'promote_users' ) )
$actions[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
* Add edit comments link with awaiting moderation count bubble.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_comments_menu( $wp_admin_bar ) {
if ( !current_user_can('edit_posts') )
* Add appearance submenu items to the "Site Name" menu.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
$wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
if ( current_theme_supports( 'widgets' ) )
$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) );
- if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
+ if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
if ( current_theme_supports( 'custom-background' ) )
* Provide an update link if theme/plugin/core updates are available.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_updates_menu( $wp_admin_bar ) {
return;
$title = '<span class="ab-icon"></span><span class="ab-label">' . number_format_i18n( $update_data['counts']['total'] ) . '</span>';
+ $title .= '<span class="screen-reader-text">' . $update_data['title'] . '</span>';
$wp_admin_bar->add_menu( array(
'id' => 'updates',
* Add search form.
*
* @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_search_menu( $wp_admin_bar ) {
if ( is_admin() )
return;
$form = '<form action="' . esc_url( home_url( '/' ) ) . '" method="get" id="adminbarsearch">';
- $form .= '<input class="adminbar-input" name="s" id="adminbar-search" tabindex="10" type="text" value="" maxlength="150" />';
+ $form .= '<input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />';
$form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>';
$form .= '</form>';
* Add secondary menus.
*
* @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
$wp_admin_bar->add_group( array(
* Style and scripts for the admin bar.
*
* @since 3.1.0
- *
*/
function wp_admin_bar_header() { ?>
<style type="text/css" media="print">#wpadminbar { display:none; }</style>
* Default admin bar callback.
*
* @since 3.1.0
- *
*/
function _admin_bar_bump_cb() { ?>
<style type="text/css" media="screen">
- html { margin-top: 28px !important; }
- * html body { margin-top: 28px !important; }
+ html { margin-top: 32px !important; }
+ * html body { margin-top: 32px !important; }
+ @media screen and ( max-width: 782px ) {
+ html { margin-top: 46px !important; }
+ * html body { margin-top: 46px !important; }
+ }
</style>
<?php
}
global $show_admin_bar, $pagenow;
// For all these types of requests, we never want an admin bar.
- if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
+ if ( defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
return false;
// Integrated into the admin.
}
}
+ /**
+ * Filter whether to show the admin bar.
+ *
+ * Returning false to this hook is the recommended way to hide the admin bar.
+ * The user's display preference is used for logged in users.
+ *
+ * @since 3.1.0
+ *
+ * @param bool $show_admin_bar Whether the admin bar should be shown. Default false.
+ */
$show_admin_bar = apply_filters( 'show_admin_bar', $show_admin_bar );
return $show_admin_bar;
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff