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 de33f54d542bf5ec41ac774a011095a6d075f4c6..c043aef81b2102edef94944be3b3c8ba98cc4d2f 100644 (file)
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -1,8 +1,10 @@
 <?php
 /**
- * Admin Bar
+ * Toolbar API: Top-level Toolbar functionality
  *
- * This code handles the building and rendering of the press bar.
+ * @package WordPress
+ * @subpackage Toolbar
+ * @since 3.1.0
  */
 
 /**
@@ -179,11 +181,18 @@ function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
 function wp_admin_bar_my_account_item( $wp_admin_bar ) {
        $user_id      = get_current_user_id();
        $current_user = wp_get_current_user();
-       $profile_url  = get_edit_profile_url( $user_id );
 
        if ( ! $user_id )
                return;
 
+       if ( current_user_can( 'read' ) ) {
+               $profile_url = get_edit_profile_url( $user_id );
+       } elseif ( is_multisite() ) {
+               $profile_url = get_dashboard_url( $user_id, 'profile.php' );
+       } else {
+               $profile_url = false;
+       }
+
        $avatar = get_avatar( $user_id, 26 );
        $howdy  = sprintf( __('Howdy, %1$s'), $current_user->display_name );
        $class  = empty( $avatar ) ? '' : 'with-avatar';
@@ -209,11 +218,18 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) {
 function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
        $user_id      = get_current_user_id();
        $current_user = wp_get_current_user();
-       $profile_url  = get_edit_profile_url( $user_id );
 
        if ( ! $user_id )
                return;
 
+       if ( current_user_can( 'read' ) ) {
+               $profile_url = get_edit_profile_url( $user_id );
+       } elseif ( is_multisite() ) {
+               $profile_url = get_dashboard_url( $user_id, 'profile.php' );
+       } else {
+               $profile_url = false;
+       }
+
        $wp_admin_bar->add_group( array(
                'parent' => 'my-account',
                'id'     => 'user-actions',
@@ -234,12 +250,16 @@ function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
                        'tabindex' => -1,
                ),
        ) );
-       $wp_admin_bar->add_menu( array(
-               'parent' => 'user-actions',
-               'id'     => 'edit-profile',
-               'title'  => __( 'Edit My Profile' ),
-               'href' => $profile_url,
-       ) );
+
+       if ( false !== $profile_url ) {
+               $wp_admin_bar->add_menu( array(
+                       'parent' => 'user-actions',
+                       'id'     => 'edit-profile',
+                       'title'  => __( 'Edit My Profile' ),
+                       'href'   => $profile_url,
+               ) );
+       }
+
        $wp_admin_bar->add_menu( array(
                'parent' => 'user-actions',
                'id'     => 'logout',
@@ -281,7 +301,7 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
        $wp_admin_bar->add_menu( array(
                'id'    => 'site-name',
                'title' => $title,
-               'href'  => is_admin() ? home_url( '/' ) : admin_url(),
+               'href'  => ( is_admin() || ! current_user_can( 'read' ) ) ? home_url( '/' ) : admin_url(),
        ) );
 
        // Create submenu items.
@@ -304,7 +324,7 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
                        ) );
                }
 
-       } else {
+       } else if ( current_user_can( 'read' ) ) {
                // We're on the front end, link to the Dashboard.
                $wp_admin_bar->add_menu( array(
                        'parent' => 'site-name',
@@ -416,6 +436,12 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
                        'title'  => __( 'Plugins' ),
                        'href'   => network_admin_url( 'plugins.php' ),
                ) );
+               $wp_admin_bar->add_menu( array(
+                       'parent' => 'network-admin',
+                       'id'     => 'network-admin-o',
+                       'title'  => __( 'Settings' ),
+                       'href'   => network_admin_url( 'settings.php' ),
+               ) );
        }
 
        // Add site links
@@ -512,7 +538,7 @@ function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
  *
  * @since 3.1.0
  *
- * @global object   $tag
+ * @global WP_Term  $tag
  * @global WP_Query $wp_the_query
  *
  * @param WP_Admin_Bar $wp_admin_bar
@@ -532,9 +558,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
                        && ( $post_type_object->show_in_admin_bar ) )
                {
                        if ( 'draft' == $post->post_status ) {
-                               $preview_link = set_url_scheme( get_permalink( $post->ID ) );
-                               /** This filter is documented in wp-admin/includes/meta-boxes.php */
-                               $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
+                               $preview_link = get_preview_post_link( $post );
                                $wp_admin_bar->add_menu( array(
                                        'id' => 'preview',
                                        'title' => $post_type_object->labels->view_item,
@@ -548,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 )
                {
@@ -568,7 +592,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
                if ( ! empty( $current_object->post_type )
                        && ( $post_type_object = get_post_type_object( $current_object->post_type ) )
                        && current_user_can( 'edit_post', $current_object->ID )
-                       && $post_type_object->show_ui && $post_type_object->show_in_admin_bar
+                       && $post_type_object->show_in_admin_bar
                        && $edit_post_link = get_edit_post_link( $current_object->ID ) )
                {
                        $wp_admin_bar->add_menu( array(
@@ -579,7 +603,6 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
                } elseif ( ! empty( $current_object->taxonomy )
                        && ( $tax = get_taxonomy( $current_object->taxonomy ) )
                        && current_user_can( $tax->cap->edit_terms )
-                       && $tax->show_ui
                        && $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) )
                {
                        $wp_admin_bar->add_menu( array(
@@ -668,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 ),
        ) );
 }
 
@@ -855,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.
  */
@@ -869,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.
  */
@@ -881,6 +904,10 @@ function is_admin_bar_showing() {
        if ( defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
                return false;
 
+       if ( is_embed() ) {
+               return false;
+       }
+
        // Integrated into the admin.
        if ( is_admin() )
                return true;