WordPress 4.2.5-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..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 = '';
                $admin_is_parent = false;
                $class = array();
                $aria_attributes = '';

+               $aria_hidden = '';
+               $is_separator = false;

 
                if ( $first ) {
                        $class[] = 'wp-first-item';
                        $first = 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]];
                if ( ! empty( $submenu[$item[2]] ) ) {
                        $class[] = 'wp-has-submenu';
                        $submenu_items = $submenu[$item[2]];


@@ -73,16 +75,23 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                }
 
                if ( ! empty( $item[4] ) )
                }
 
                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';
 
 
                $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="" />';
 
                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] );
 
 
                $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.
                        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;
                        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;
                        foreach ( $submenu_items as $sub_key => $sub_item ) {
                                if ( ! current_user_can( $sub_item[1] ) )
                                        continue;


@@ -158,13 +174,17 @@ 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.
                                                $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 ) )
                                ) {
                                        $class[] = 'current';
                                }
 
                                        ( ! 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 ) )
                                ) {
                                        $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]);
                                $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
 
                                $menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);


@@ -199,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">
 <div id="adminmenuback"></div>
 <div id="adminmenuwrap">

-<ul id="adminmenu" role="navigation">
+<ul id="adminmenu">

 
 <?php
 
 
 <?php
 


@@ -216,3 +239,4 @@ do_action( 'adminmenu' );
 ?>
 </ul>
 </div>
 ?>
 </ul>
 </div>

+</div>