WordPress 4.2

[autoinstalls/wordpress.git] / wp-admin / menu-header.php

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 275cc145d9882d1764061ab9cf9361c4203bf954..d73fe9bd3150b0222d479f400baa99404ab3f939 100644 (file)
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -52,13 +52,15 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                $admin_is_parent = false;
                $class = array();
                $aria_attributes = '';
+               $aria_hidden = '';
+               $is_separator = false;
 
                if ( $first ) {
                        $class[] = 'wp-first-item';
                        $first = false;
                }
 
-               $submenu_items = false;
+               $submenu_items = array();
                if ( ! empty( $submenu[$item[2]] ) ) {
                        $class[] = 'wp-has-submenu';
                        $submenu_items = $submenu[$item[2]];
@@ -80,6 +82,10 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                $img = $img_style = '';
                $img_class = ' dashicons-before';
 
+               if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+                       $is_separator = true;
+               }
+
                /*
                 * If the string 'none' (previously 'div') is passed instead of an URL, don't output
                 * the default menu image so an icon can be added to div.wp-menu-image as background
@@ -104,9 +110,14 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 
                $title = wptexturize( $item[0] );
 
-               echo "\n\t<li$class$id>";
+               // hide separators from screen readers
+               if ( $is_separator ) {
+                       $aria_hidden = ' aria-hidden="true"';
+               }
 
-               if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+               echo "\n\t<li$class$id$aria_hidden>";
+
+               if ( $is_separator ) {
                        echo '<div class="separator"></div>';
                } elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
                        $submenu_items = array_values( $submenu_items );  // Re-index.
@@ -163,7 +174,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                                                $class[] = 'current';
                                // If plugin_page is set the parent must either match the current page or not physically exist.
                                // This allows plugin pages with the same hook to exist under different parents.
-                               } else if (
+                               } elseif (
                                        ( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
                                        ( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
                                ) {
@@ -208,9 +219,12 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 
 ?>
 
+<div id="adminmenumain" role="navigation" aria-label="<?php esc_attr_e( 'Main menu' ); ?>">
+<a href="#wpbody-content" class="screen-reader-shortcut"><?php _e( 'Skip to main content' ); ?></a>
+<a href="#wp-toolbar" class="screen-reader-shortcut"><?php _e( 'Skip to toolbar' ); ?></a>
 <div id="adminmenuback"></div>
 <div id="adminmenuwrap">
-<ul id="adminmenu" role="navigation">
+<ul id="adminmenu">
 
 <?php
 
@@ -225,3 +239,4 @@ do_action( 'adminmenu' );
 ?>
 </ul>
 </div>
+</div>