X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/af50974463450c98503e763a7836a50e260461a9..16e7b37c7914d753890c1a05a9335f3b43751eb8:/wp-includes/admin-bar.php diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 32853c3a..83deb960 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -1,18 +1,23 @@ 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 + * + * @global WP_Admin_Bar $wp_admin_bar */ function wp_admin_bar_render() { global $wp_admin_bar; if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) ) - return false; + return; /** * Load all necessary admin bar items. @@ -92,8 +98,6 @@ function wp_admin_bar_render() { */ do_action( 'wp_after_admin_bar_render' ); } -add_action( 'wp_footer', 'wp_admin_bar_render', 1000 ); -add_action( 'in_admin_header', 'wp_admin_bar_render', 0 ); /** * Add the WordPress logo menu. @@ -103,22 +107,36 @@ add_action( 'in_admin_header', 'wp_admin_bar_render', 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' => '', - 'href' => self_admin_url( 'about.php' ), - 'meta' => array( - 'title' => __('About WordPress'), - ), - ) ); + 'title' => '' . __( 'About WordPress' ) . '', + '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, ) ); } @@ -135,7 +153,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { 'parent' => 'wp-logo-external', 'id' => 'documentation', 'title' => __('Documentation'), - 'href' => __('http://codex.wordpress.org/'), + 'href' => __('https://codex.wordpress.org/'), ) ); // Add forums link @@ -182,13 +200,21 @@ 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 ); + /* 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( @@ -198,7 +224,6 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) { 'href' => $profile_url, 'meta' => array( 'class' => $class, - 'title' => __('My Account'), ), ) ); } @@ -213,11 +238,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', @@ -238,12 +270,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', @@ -275,9 +311,11 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) { } 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( __('Global 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, '…' ); @@ -285,7 +323,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. @@ -308,7 +346,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', @@ -322,6 +360,48 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) { } } +/** + * Adds the "Customize" link to the Toolbar. + * + * @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', + 'title' => __( 'Customize' ), + 'href' => $customize_url, + 'meta' => array( + 'class' => 'hide-if-no-customize', + ), + ) ); + add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' ); +} + /** * Add the "My Sites/[Site Name]" menu and all submenus. * @@ -338,10 +418,16 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) { if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() ) return; + if ( $wp_admin_bar->user->active_blog ) { + $my_sites_url = get_admin_url( $wp_admin_bar->user->active_blog->blog_id, 'my-sites.php' ); + } else { + $my_sites_url = admin_url( 'my-sites.php' ); + } + $wp_admin_bar->add_menu( array( 'id' => 'my-sites', 'title' => __( 'My Sites' ), - 'href' => admin_url( 'my-sites.php' ), + 'href' => $my_sites_url, ) ); if ( is_super_admin() ) { @@ -387,6 +473,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 @@ -483,6 +575,9 @@ function wp_admin_bar_shortlink_menu( $wp_admin_bar ) { * * @since 3.1.0 * + * @global WP_Term $tag + * @global WP_Query $wp_the_query + * * @param WP_Admin_Bar $wp_admin_bar */ function wp_admin_bar_edit_menu( $wp_admin_bar ) { @@ -499,10 +594,8 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) { && ( $post_type_object->public ) && ( $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 ); + if ( 'draft' == $post->post_status ) { + $preview_link = get_preview_post_link( $post ); $wp_admin_bar->add_menu( array( 'id' => 'preview', 'title' => $post_type_object->labels->view_item, @@ -516,8 +609,20 @@ 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 ( '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 ) { @@ -536,7 +641,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( @@ -546,8 +651,7 @@ 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 + && 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( @@ -609,9 +713,6 @@ function wp_admin_bar_new_content_menu( $wp_admin_bar ) { 'id' => 'new-content', 'title' => $title, 'href' => admin_url( current( array_keys( $actions ) ) ), - 'meta' => array( - 'title' => _x( 'Add New', 'admin bar menu group label' ), - ), ) ); foreach ( $actions as $link => $action ) { @@ -639,16 +740,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 = ''; - $title = '' . number_format_i18n( $awaiting_mod ) . ''; + $title = ''; + $title .= '' . $awaiting_text . ''; $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => $icon . $title, 'href' => admin_url('edit-comments.php'), - 'meta' => array( 'title' => $awaiting_title ), ) ); } @@ -662,30 +763,28 @@ function wp_admin_bar_comments_menu( $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_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) - $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'themes', 'title' => __('Themes'), 'href' => admin_url('themes.php') ) ); + if ( current_user_can( 'switch_themes' ) ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'appearance', + 'id' => 'themes', + 'title' => __( 'Themes' ), + 'href' => admin_url( 'themes.php' ), + ) ); + } - if ( ! current_user_can( 'edit_theme_options' ) ) + if ( ! current_user_can( 'edit_theme_options' ) ) { return; + } - $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; - $customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ); - if ( current_user_can( 'customize' ) ) { + if ( current_theme_supports( 'widgets' ) ) { $wp_admin_bar->add_menu( array( 'parent' => 'appearance', - 'id' => 'customize', - 'title' => __('Customize'), - 'href' => $customize_url, - 'meta' => array( - 'class' => 'hide-if-no-customize', - ), + 'id' => 'widgets', + 'title' => __( 'Widgets' ), + 'href' => admin_url( 'widgets.php' ), ) ); - add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' ); } - 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' ) ) $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) ); @@ -699,18 +798,6 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) { 'class' => 'hide-if-customize', ), ) ); - - if ( current_user_can( 'customize' ) ) { - $wp_admin_bar->add_menu( array( - 'parent' => 'appearance', - 'id' => 'customize-background', - 'title' => __( 'Background' ), - 'href' => add_query_arg( urlencode( 'autofocus[control]' ), 'background_image', $customize_url ), // urlencode() needed due to #16859 - 'meta' => array( - 'class' => 'hide-if-no-customize', - ), - ) ); - } } if ( current_theme_supports( 'custom-header' ) ) { @@ -723,18 +810,6 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) { 'class' => 'hide-if-customize', ), ) ); - - if ( current_user_can( 'customize' ) ) { - $wp_admin_bar->add_menu( array( - 'parent' => 'appearance', - 'id' => 'customize-header', - 'title' => __( 'Header' ), - 'href' => add_query_arg( urlencode( 'autofocus[control]' ), 'header_image', $customize_url ), // urlencode() needed due to #16859 - 'meta' => array( - 'class' => 'hide-if-no-customize', - ), - ) ); - } } } @@ -779,6 +854,7 @@ function wp_admin_bar_search_menu( $wp_admin_bar ) { $form = '
'; $form .= ''; + $form .= ''; $form .= ''; $form .= '
'; @@ -845,14 +921,16 @@ function _admin_bar_bump_cb() { ?> } /** - * 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 bool $show_admin_bar + * * @param bool $show Whether to allow the admin bar to show. - * @return void */ function show_admin_bar( $show ) { global $show_admin_bar; @@ -864,6 +942,9 @@ function show_admin_bar( $show ) { * * @since 3.1.0 * + * @global bool $show_admin_bar + * @global string $pagenow + * * @return bool Whether the admin bar should be showing. */ function is_admin_bar_showing() { @@ -873,6 +954,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; @@ -886,7 +971,7 @@ function is_admin_bar_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.