WordPress 4.5

[autoinstalls/wordpress.git] / wp-includes / admin-bar.php

diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index 2bf56a8630a9479c79af736d6884135f41b82e2e..c043aef81b2102edef94944be3b3c8ba98cc4d2f 100644 (file)
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -558,8 +558,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
                        && ( $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,
@@ -573,8 +572,8 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
                                        'href' => get_permalink( $post->ID )
                                ) );
                        }
-               } elseif ( 'edit-tags' == $current_screen->base
-                       && isset( $tag ) && is_object( $tag )
+               } elseif ( 'term' == $current_screen->base
+                       && isset( $tag ) && is_object( $tag ) && ! is_wp_error( $tag )
                        && ( $tax = get_taxonomy( $tag->taxonomy ) )
                        && $tax->public )
                {
@@ -692,16 +691,16 @@ function wp_admin_bar_comments_menu( $wp_admin_bar ) {
 
        $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 id="ab-awaiting-mod" 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 ),
        ) );
 }
 
@@ -879,7 +878,7 @@ function _admin_bar_bump_cb() { ?>
  *
  * @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.
  */
@@ -893,8 +892,8 @@ function show_admin_bar( $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.
  */