WordPress 4.1.2-scripts

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

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 1771fb0f8ac4a3bf80daa6777cb59dd45ce5e3ed..dea73320f064955102c1499deb24c065da773435 100644 (file)
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -52,6 +52,8 @@ 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';
@@ -73,16 +75,23 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                }
 
                if ( ! empty( $item[4] ) )
-                       $class[] = $item[4];
+                       $class[] = esc_attr( $item[4] );
 
                $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
                $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
                $img = $img_style = '';
                $img_class = ' dashicons-before';
 
-               // 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 with CSS.
-               // Dashicons and base64-encoded data:image/svg_xml URIs are also handled as special cases.
+               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
+                * with CSS. Dashicons and base64-encoded data:image/svg_xml URIs are also handled
+                * as special cases.
+                */
                if ( ! empty( $item[6] ) ) {
                        $img = '<img src="' . $item[6] . '" alt="" />';
 
@@ -101,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.
@@ -135,6 +149,8 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                        echo "<li class='wp-submenu-head'>{$item[0]}</li>";
 
                        $first = true;
+
+                       // 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes
                        foreach ( $submenu_items as $sub_key => $sub_item ) {
                                if ( ! current_user_can( $sub_item[1] ) )
                                        continue;
@@ -165,6 +181,10 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                                        $class[] = 'current';
                                }
 
+                               if ( ! empty( $sub_item[4] ) ) {
+                                       $class[] = esc_attr( $sub_item[4] );
+                               }
+
                                $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
 
                                $menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);