Ticket #19394: 19394.diff

wp-includes/class-wp-admin-bar.php

@@ -179 +179 @@
                 }
 
                 ?>
-                <div id="wpadminbar" class="<?php echo $class; ?>">
-                        <div class="quicklinks">
+                <div id="wpadminbar" class="<?php echo $class; ?>" role="navigation">
+                        <div class="quicklinks" role="menubar">
                                 <?php foreach ( $this->root->children as $group ) {
                                         $this->render_group( $group, 'ab-top-menu' );
                                 } ?>
@@ -218 +218 @@
                         if ( ! empty( $node->meta['class'] ) )
                                 $class .= ' ' . $node->meta['class'];
 
-                        ?><ul id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $class ); ?>"><?php
+                        ?><ul id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $class ); ?>" role="menu"><?php
                                 foreach ( $node->children as $item ) {
                                         $this->render_item( $item );
                                 }
@@ -226 +226 @@
 
                 // Wrap the subgroups in a div and render each individual subgroup.
                 elseif ( ! $is_single_group ):
-                        ?><div id="<?php echo esc_attr( "wp-admin-bar-{$node->id}-container" ); ?>" class="ab-group-container"><?php
+                        ?><div id="<?php echo esc_attr( "wp-admin-bar-{$node->id}-container" ); ?>" class="ab-group-container" role="menu"><?php
                                 foreach ( $groups as $group ) {
                                         $this->render_group( $group, $class );
                                 }
@@ -248 +248 @@
                 $tabindex = !empty($node->meta['tabindex']) ? $node->meta['tabindex'] : 10;
                 ?>
 
-                <li id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $menuclass ); ?>"><?php
+                <li id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $menuclass ); ?>" role="menuitem"><?php
                         if ( $has_link ):
-                                ?><a class="ab-item" tabindex="<?php echo (int) $tabindex; ?>" href="<?php echo esc_url( $node->href ) ?>"<?php
+                                ?><a class="ab-item" tabindex="<?php echo (int) $tabindex; ?>" href="<?php echo esc_url( $node->href ) ?>" <?php
                                         if ( ! empty( $node->meta['onclick'] ) ) :
                                                 ?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
                                         endif;

wp-admin/menu-header.php

@@ -171 +171 @@
 <div id="adminmenuback"></div>
 <div id="adminmenuwrap">
 <div id="adminmenushadow"></div>
-<ul id="adminmenu">
+<ul id="adminmenu" role="navigation">
 
 <?php