]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-includes/admin-bar.php
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
WordPress 4.2.4-scripts
[autoinstalls/wordpress.git] / wp-includes / admin-bar.php
diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index cd1bb82a5535a5a187e344ec3d2d739b9b467828..746fdca7821fc0a7b47fd732ca67fbf9459c82ff 100644 (file)
--- 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 */
                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 */
 
 
        /* Instantiate the admin bar */
 
@@ -44,9 +44,6 @@ function _wp_admin_bar_init() {
 
        return true;
 }
 
        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.
 
 /**
  * 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' );
 }
         */
        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.
 
 /**
  * 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',
 function wp_admin_bar_wp_menu( $wp_admin_bar ) {
        $wp_admin_bar->add_menu( array(
                'id'    => 'wp-logo',
-               'title' => '<span class="ab-icon"></span>',
+               'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'About WordPress' ) . '</span>',
                'href'  => self_admin_url( 'about.php' ),
                'href'  => self_admin_url( 'about.php' ),
-               'meta'  => array(
-                       'title' => __('About WordPress'),
-               ),
        ) );
 
        if ( is_user_logged_in() ) {
        ) );
 
        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'),
                        'parent' => 'wp-logo',
                        'id'     => 'about',
                        'title'  => __('About WordPress'),
-                       'href'  => self_admin_url( 'about.php' ),
+                       'href'   => self_admin_url( 'about.php' ),
                ) );
        }
 
                ) );
        }
 
@@ -135,7 +127,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) {
                'parent'    => 'wp-logo-external',
                'id'        => 'documentation',
                'title'     => __('Documentation'),
                'parent'    => 'wp-logo-external',
                'id'        => 'documentation',
                'title'     => __('Documentation'),
-               'href'      => __('http://codex.wordpress.org/'),
+               'href'      => __('https://codex.wordpress.org/'),
        ) );
 
        // Add forums link
        ) );
 
        // Add forums link
@@ -198,7 +190,6 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) {
                'href'      => $profile_url,
                'meta'      => array(
                        'class'     => $class,
                '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');
 
 
        $blogname = get_bloginfo('name');
 
-       if ( empty( $blogname ) )
+       if ( ! $blogname ) {
                $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
                $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
+       }
 
        if ( is_network_admin() ) {
                $blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) );
 
        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 ( 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' ),
        $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() ) {
        ) );
 
        if ( is_super_admin() ) {
@@ -402,7 +400,12 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 
                $blavatar = '<div class="blavatar"></div>';
 
 
                $blavatar = '<div class="blavatar"></div>';
 
-               $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(
                $menu_id  = 'blog-' . $blog->userblog_id;
 
                $wp_admin_bar->add_menu( array(
@@ -530,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 )
                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,
                {
                        $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 )
                        ) );
                } 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,
                {
                        $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
                        ) );
                }
        }
                        ) );
                }
        }
@@ -601,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 ) ) ),
                '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 ) {
        ) );
 
        foreach ( $actions as $link => $action ) {
@@ -654,19 +656,39 @@ 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' ) );
 
 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( 'edit_theme_options' ) )
-               return;
+       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' ) ) {
 
        if ( current_user_can( 'customize' ) ) {
-               $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
                $wp_admin_bar->add_menu( array(
                        'parent' => 'appearance',
                        'id'     => 'customize',
                        'title'  => __('Customize'),
                $wp_admin_bar->add_menu( array(
                        'parent' => 'appearance',
                        'id'     => 'customize',
                        'title'  => __('Customize'),
-                       'href'   => add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ),
+                       'href'   => $customize_url,
                        'meta'   => array(
                                'class' => 'hide-if-no-customize',
                        ),
                        'meta'   => array(
                                'class' => 'hide-if-no-customize',
                        ),
@@ -674,17 +696,85 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
                add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
        }
 
                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_user_can( 'edit_theme_options' ) ) {
+               return;
+       }
+
+       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_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( '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') ) );
 }
 
 /**
 }
 
 /**
@@ -727,6 +817,7 @@ function wp_admin_bar_search_menu( $wp_admin_bar ) {
 
        $form  = '<form action="' . esc_url( home_url( '/' ) ) . '" method="get" id="adminbarsearch">';
        $form .= '<input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />';
 
        $form  = '<form action="' . esc_url( home_url( '/' ) ) . '" method="get" id="adminbarsearch">';
        $form .= '<input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />';
+       $form .= '<label for="adminbar-search" class="screen-reader-text">' . __( 'Search' ) . '</label>';
        $form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>';
        $form .= '</form>';
 
        $form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>';
        $form .= '</form>';
 
WordPress autoinstaller for phpBB