X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/85ad385665744d9cc3bcd939906309be7268edb3..46588ee871246a923d972538dbc93b26f4fda932:/wp-includes/admin-bar.php diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 67e6a1a5..746fdca7 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -22,7 +22,7 @@ function _wp_admin_bar_init() { return false; /* Load the admin bar class code ready for instantiation */ - require( ABSPATH . WPINC . '/class-wp-admin-bar.php' ); + require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' ); /* Instantiate the admin bar */ @@ -44,9 +44,6 @@ function _wp_admin_bar_init() { return true; } -// 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. @@ -92,8 +89,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. @@ -105,11 +100,8 @@ add_action( 'in_admin_header', 'wp_admin_bar_render', 0 ); function wp_admin_bar_wp_menu( $wp_admin_bar ) { $wp_admin_bar->add_menu( array( 'id' => 'wp-logo', - 'title' => '', + 'title' => '' . __( 'About WordPress' ) . '', 'href' => self_admin_url( 'about.php' ), - 'meta' => array( - 'title' => __('About WordPress'), - ), ) ); if ( is_user_logged_in() ) { @@ -118,7 +110,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { 'parent' => 'wp-logo', 'id' => 'about', 'title' => __('About WordPress'), - 'href' => self_admin_url( 'about.php' ), + 'href' => self_admin_url( 'about.php' ), ) ); } @@ -127,7 +119,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { 'parent' => 'wp-logo-external', 'id' => 'wporg', 'title' => __('WordPress.org'), - 'href' => __('http://wordpress.org/'), + 'href' => __('https://wordpress.org/'), ) ); // Add codex link @@ -135,7 +127,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 @@ -143,7 +135,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { 'parent' => 'wp-logo-external', 'id' => 'support-forums', 'title' => __('Support Forums'), - 'href' => __('http://wordpress.org/support/'), + 'href' => __('https://wordpress.org/support/'), ) ); // Add feedback link @@ -151,7 +143,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { 'parent' => 'wp-logo-external', 'id' => 'feedback', 'title' => __('Feedback'), - 'href' => __('http://wordpress.org/support/forum/requests-and-feedback'), + 'href' => __('https://wordpress.org/support/forum/requests-and-feedback'), ) ); } @@ -198,7 +190,6 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) { 'href' => $profile_url, 'meta' => array( 'class' => $class, - 'title' => __('My Account'), ), ) ); } @@ -270,8 +261,9 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) { $blogname = get_bloginfo('name'); - if ( empty( $blogname ) ) + if ( ! $blogname ) { $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() ); + } if ( is_network_admin() ) { $blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) ); @@ -337,10 +329,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() ) { @@ -402,7 +400,12 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) { $blavatar = '
'; - $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname; + $blogname = $blog->blogname; + + if ( ! $blogname ) { + $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() ); + } + $menu_id = 'blog-' . $blog->userblog_id; $wp_admin_bar->add_menu( array( @@ -493,11 +496,23 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) { && ( $post_type_object->public ) && ( $post_type_object->show_in_admin_bar ) ) { - $wp_admin_bar->add_menu( array( - 'id' => 'view', - 'title' => $post_type_object->labels->view_item, - 'href' => get_permalink( $post->ID ) - ) ); + 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 ); + $wp_admin_bar->add_menu( array( + 'id' => 'preview', + 'title' => $post_type_object->labels->view_item, + 'href' => esc_url( $preview_link ), + 'meta' => array( 'target' => 'wp-preview-' . $post->ID ), + ) ); + } else { + $wp_admin_bar->add_menu( array( + 'id' => 'view', + 'title' => $post_type_object->labels->view_item, + 'href' => get_permalink( $post->ID ) + ) ); + } } elseif ( 'edit-tags' == $current_screen->base && isset( $tag ) && is_object( $tag ) && ( $tax = get_taxonomy( $tag->taxonomy ) ) @@ -518,22 +533,24 @@ 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_ui && $post_type_object->show_in_admin_bar + && $edit_post_link = get_edit_post_link( $current_object->ID ) ) { $wp_admin_bar->add_menu( array( 'id' => 'edit', 'title' => $post_type_object->labels->edit_item, - 'href' => get_edit_post_link( $current_object->ID ) + 'href' => $edit_post_link ) ); } elseif ( ! empty( $current_object->taxonomy ) && ( $tax = get_taxonomy( $current_object->taxonomy ) ) && current_user_can( $tax->cap->edit_terms ) - && $tax->show_ui ) + && $tax->show_ui + && $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) ) { $wp_admin_bar->add_menu( array( 'id' => 'edit', 'title' => $tax->labels->edit_item, - 'href' => get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) + 'href' => $edit_term_link ) ); } } @@ -589,9 +606,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 ) { @@ -642,35 +656,125 @@ 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') ) ); + $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( 'switch_themes' ) ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'appearance', + 'id' => 'themes', + 'title' => __( 'Themes' ), + 'href' => admin_url( 'themes.php' ), + 'meta' => array( + 'class' => 'hide-if-customize', + ), + ) ); + + if ( current_user_can( 'customize' ) ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'appearance', + 'id' => 'customize-themes', + 'title' => __( 'Themes' ), + 'href' => add_query_arg( urlencode( 'autofocus[section]' ), 'themes', $customize_url ), // urlencode() needed due to #16859 + 'meta' => array( + 'class' => 'hide-if-no-customize', + ), + ) ); + } + } + + if ( current_user_can( 'customize' ) ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'appearance', + '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' ); + } - 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']; - $wp_admin_bar->add_menu( array( - 'parent' => 'appearance', - 'id' => 'customize', - 'title' => __('Customize'), - 'href' => add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ), - 'meta' => array( - 'class' => 'hide-if-no-customize', - ), - ) ); - 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' ), + 'meta' => array( + 'class' => 'hide-if-customize', + ), + ) ); - if ( current_theme_supports( 'widgets' ) ) - $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) ); + if ( current_user_can( 'customize' ) ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'appearance', + 'id' => 'customize-widgets', + 'title' => __( 'Widgets' ), + 'href' => add_query_arg( urlencode( 'autofocus[panel]' ), 'widgets', $customize_url ), // urlencode() needed due to #16859 + 'meta' => array( + 'class' => 'hide-if-no-customize', + ), + ) ); + } + } 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' ) ) - $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'background', 'title' => __('Background'), 'href' => admin_url('themes.php?page=custom-background') ) ); + if ( current_theme_supports( 'custom-background' ) ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'appearance', + 'id' => 'background', + 'title' => __( 'Background' ), + 'href' => admin_url( 'themes.php?page=custom-background' ), + 'meta' => array( + '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' ) ) { + $wp_admin_bar->add_menu( array( + 'parent' => 'appearance', + 'id' => 'header', + 'title' => __( 'Header' ), + 'href' => admin_url( 'themes.php?page=custom-header' ), + 'meta' => array( + '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', + ), + ) ); + } + } - if ( current_theme_supports( 'custom-header' ) ) - $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'header', 'title' => __('Header'), 'href' => admin_url('themes.php?page=custom-header') ) ); } /** @@ -713,6 +817,7 @@ function wp_admin_bar_search_menu( $wp_admin_bar ) { $form = '
'; $form .= ''; + $form .= ''; $form .= ''; $form .= '
';