@@ -638,9 +638,9 @@ if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('m
link_id) ) { ?>
-
+
-
+
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 383487458a..1ad997964f 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -332,17 +332,17 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
@@ -350,13 +350,13 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
- wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings, 'tabindex' => 104 ) );
+ wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
?>
-
-
+
+
@@ -489,17 +489,17 @@ function _list_meta_row( $entry, &$count ) {
$delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] );
$r .= "\n\t
";
- $r .= "\n\t\t";
+ $r .= "\n\t\t | ";
$r .= "\n\t\t ";
- $r .= get_submit_button( __( 'Delete' ), "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta", "deletemeta[{$entry['meta_id']}]", false, array( 'tabindex' => '6' ) );
+ $r .= get_submit_button( __( 'Delete' ), "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta", "deletemeta[{$entry['meta_id']}]", false );
$r .= "\n\t\t";
- $r .= get_submit_button( __( 'Update' ), "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce updatemeta" , 'updatemeta', false, array( 'tabindex' => '6' ) );
+ $r .= get_submit_button( __( 'Update' ), "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce updatemeta" , 'updatemeta', false );
$r .= " ";
$r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
$r .= " | ";
- $r .= "\n\t\t | \n\t
";
+ $r .= "\n\t\t
| \n\t";
return $r;
}
@@ -534,7 +534,7 @@ function meta_form() {
- |
- |
+ |
- 'addmetasub', 'tabindex' => '9' ) ); ?>
+ 'addmetasub' ) ); ?>
|
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 017f676acf..ab51cbc3a2 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -41,7 +41,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
foreach ( $menu as $key => $item ) {
$admin_is_parent = false;
$class = array();
- $aria_attributes = 'tabindex="1"';
+ $aria_attributes = '';
if ( $first ) {
$class[] = 'wp-first-item';
@@ -59,7 +59,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
} else {
$class[] = 'wp-not-current-submenu';
if ( ! empty( $submenu_items ) )
- $aria_attributes .= ' aria-haspopup="true"';
+ $aria_attributes .= 'aria-haspopup="true"';
}
if ( ! empty( $item[4] ) )
@@ -87,9 +87,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$menu_file = substr( $menu_file, 0, $pos );
if ( ! empty( $menu_hook ) || ( ('index.php' != $submenu_items[0][2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
$admin_is_parent = true;
- echo "$arrow
$title";
+ echo "$arrow
$title";
} else {
- echo "\n\t$arrow
$title";
+ echo "\n\t$arrow
$title";
}
} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
@@ -98,9 +98,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$menu_file = substr( $menu_file, 0, $pos );
if ( ! empty( $menu_hook ) || ( ('index.php' != $item[2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
$admin_is_parent = true;
- echo "\n\t$arrow
{$item[0]}";
+ echo "\n\t$arrow
{$item[0]}";
} else {
- echo "\n\t$arrow
{$item[0]}";
+ echo "\n\t$arrow
{$item[0]}";
}
}
@@ -112,7 +112,6 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
if ( ! current_user_can( $sub_item[1] ) )
continue;
- $aria_attributes = 'tabindex="1"';
$class = array();
if ( $first ) {
$class[] = 'wp-first-item';
@@ -156,9 +155,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$sub_item_url = add_query_arg( array('page' => $sub_item[2]), 'admin.php' );
$sub_item_url = esc_url( $sub_item_url );
- echo "
$title";
+ echo "
$title";
} else {
- echo "
$title";
+ echo "
$title";
}
}
echo "