* Instantiate the admin bar object and set it up as a global for access elsewhere.
*
* UNHOOKING THIS FUNCTION WILL NOT PROPERLY REMOVE THE ADMIN BAR.
- * For that, use show_admin_bar(false) or the 'show_admin_bar' filter.
+ * For that, use show_admin_bar(false) or the {@see 'show_admin_bar'} filter.
*
* @since 3.1.0
* @access private
/* Instantiate the admin bar */
/**
- * Filter the admin bar class to instantiate.
+ * Filters the admin bar class to instantiate.
*
* @since 3.1.0
*
}
/**
- * Render the admin bar to the page based on the $wp_admin_bar->menu member var.
- * This is called very late on the footer actions so that it will render after anything else being
- * added to the footer.
+ * Renders the admin bar to the page based on the $wp_admin_bar->menu member var.
*
- * It includes the action "admin_bar_menu" which should be used to hook in and
- * add new menus to the admin bar. That way you can be sure that you are adding at most optimal point,
- * right before the admin bar is rendered. This also gives you access to the $post global, among others.
+ * This is called very late on the footer actions so that it will render after
+ * anything else being added to the footer.
+ *
+ * It includes the {@see 'admin_bar_menu'} action which should be used to hook in and
+ * add new menus to the admin bar. That way you can be sure that you are adding at most
+ * optimal point, right before the admin bar is rendered. This also gives you access to
+ * the `$post` global, among others.
*
* @since 3.1.0
*
* @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_wp_menu( $wp_admin_bar ) {
- $wp_admin_bar->add_menu( array(
+ if ( current_user_can( 'read' ) ) {
+ $about_url = self_admin_url( 'about.php' );
+ } elseif ( is_multisite() ) {
+ $about_url = get_dashboard_url( get_current_user_id(), 'about.php' );
+ } else {
+ $about_url = false;
+ }
+
+ $wp_logo_menu_args = array(
'id' => 'wp-logo',
'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'About WordPress' ) . '</span>',
- 'href' => self_admin_url( 'about.php' ),
- ) );
+ 'href' => $about_url,
+ );
+
+ // Set tabindex="0" to make sub menus accessible when no URL is available.
+ if ( ! $about_url ) {
+ $wp_logo_menu_args['meta'] = array(
+ 'tabindex' => 0,
+ );
+ }
+
+ $wp_admin_bar->add_menu( $wp_logo_menu_args );
- if ( is_user_logged_in() ) {
+ if ( $about_url ) {
// Add "About WordPress" link
$wp_admin_bar->add_menu( array(
'parent' => 'wp-logo',
'id' => 'about',
'title' => __('About WordPress'),
- 'href' => self_admin_url( 'about.php' ),
+ 'href' => $about_url,
) );
}
}
$avatar = get_avatar( $user_id, 26 );
- $howdy = sprintf( __('Howdy, %1$s'), $current_user->display_name );
+ /* translators: %s: current user's display name */
+ $howdy = sprintf( __( 'Howdy, %s' ), $current_user->display_name );
$class = empty( $avatar ) ? '' : 'with-avatar';
$wp_admin_bar->add_menu( array(
}
if ( is_network_admin() ) {
- $blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) );
+ /* translators: %s: site name */
+ $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
} elseif ( is_user_admin() ) {
- $blogname = sprintf( __('User Dashboard: %s'), esc_html( get_current_site()->site_name ) );
+ /* translators: %s: site name */
+ $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
}
$title = wp_html_excerpt( $blogname, 40, '…' );
* @since 4.3.0
*
* @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
+ * @global WP_Customize_Manager $wp_customize
*/
function wp_admin_bar_customize_menu( $wp_admin_bar ) {
+ global $wp_customize;
+
// Don't show for users who can't access the customizer or when in the admin.
if ( ! current_user_can( 'customize' ) || is_admin() ) {
return;
}
+ // Don't show if the user cannot edit a given customize_changeset post currently being previewed.
+ if ( is_customize_preview() && $wp_customize->changeset_post_id() && ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $wp_customize->changeset_post_id() ) ) {
+ return;
+ }
+
$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+ if ( is_customize_preview() && $wp_customize->changeset_uuid() ) {
+ $current_url = remove_query_arg( 'customize_changeset_uuid', $current_url );
+ }
+
$customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() );
+ if ( is_customize_preview() ) {
+ $customize_url = add_query_arg( array( 'changeset_uuid' => $wp_customize->changeset_uuid() ), $customize_url );
+ }
$wp_admin_bar->add_menu( array(
'id' => 'customize',
&& ( $post_type_object->show_in_admin_bar ) )
{
if ( 'draft' == $post->post_status ) {
- $draft_link = set_url_scheme( get_permalink( $post->ID ) );
- $preview_link = get_preview_post_link( $post, array(), $draft_link );
+ $preview_link = get_preview_post_link( $post );
$wp_admin_bar->add_menu( array(
'id' => 'preview',
'title' => $post_type_object->labels->view_item,
'href' => get_permalink( $post->ID )
) );
}
- } elseif ( 'edit-tags' == $current_screen->base
- && isset( $tag ) && is_object( $tag )
+ } elseif ( 'edit' == $current_screen->base
+ && ( $post_type_object = get_post_type_object( $current_screen->post_type ) )
+ && ( $post_type_object->public )
+ && ( $post_type_object->show_in_admin_bar )
+ && ( get_post_type_archive_link( $post_type_object->name ) )
+ && ! ( 'post' === $post_type_object->name && 'posts' === get_option( 'show_on_front' ) ) )
+ {
+ $wp_admin_bar->add_node( array(
+ 'id' => 'archive',
+ 'title' => $post_type_object->labels->view_items,
+ 'href' => get_post_type_archive_link( $current_screen->post_type )
+ ) );
+ } elseif ( 'term' == $current_screen->base
+ && isset( $tag ) && is_object( $tag ) && ! is_wp_error( $tag )
&& ( $tax = get_taxonomy( $tag->taxonomy ) )
&& $tax->public )
{
) );
} elseif ( ! empty( $current_object->taxonomy )
&& ( $tax = get_taxonomy( $current_object->taxonomy ) )
- && current_user_can( $tax->cap->edit_terms )
+ && current_user_can( 'edit_term', $current_object->term_id )
&& $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) )
{
$wp_admin_bar->add_menu( array(
$awaiting_mod = wp_count_comments();
$awaiting_mod = $awaiting_mod->moderated;
- $awaiting_title = esc_attr( sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) ) );
+ $awaiting_text = sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) );
$icon = '<span class="ab-icon"></span>';
- $title = '<span id="ab-awaiting-mod" class="ab-label awaiting-mod pending-count count-' . $awaiting_mod . '">' . number_format_i18n( $awaiting_mod ) . '</span>';
+ $title = '<span class="ab-label awaiting-mod pending-count count-' . $awaiting_mod . '" aria-hidden="true">' . number_format_i18n( $awaiting_mod ) . '</span>';
+ $title .= '<span class="screen-reader-text">' . $awaiting_text . '</span>';
$wp_admin_bar->add_menu( array(
'id' => 'comments',
'title' => $icon . $title,
'href' => admin_url('edit-comments.php'),
- 'meta' => array( 'title' => $awaiting_title ),
) );
}
}
/**
- * Set the display status of the admin bar.
+ * Sets the display status of the admin bar.
*
- * This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action.
+ * This can be called immediately upon plugin load. It does not need to be called
+ * from a function hooked to the {@see 'init'} action.
*
* @since 3.1.0
*
- * @global WP_Admin_Bar $wp_admin_bar
+ * @global bool $show_admin_bar
*
* @param bool $show Whether to allow the admin bar to show.
*/
*
* @since 3.1.0
*
- * @global WP_Admin_Bar $wp_admin_bar
- * @global string $pagenow
+ * @global bool $show_admin_bar
+ * @global string $pagenow
*
* @return bool Whether the admin bar should be showing.
*/
}
/**
- * Filter whether to show the admin bar.
+ * Filters 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.
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff