X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..8f374b7233bc2815ccc387e448d208c5434eb961:/wp-admin/menu-header.php
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 1f652455..017f676a 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -13,10 +13,13 @@
* @name $self
* @var string
*/
-$self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
+$self = preg_replace('|^.*/wp-admin/network/|i', '', $_SERVER['PHP_SELF']);
+$self = preg_replace('|^.*/wp-admin/|i', '', $self);
$self = preg_replace('|^.*/plugins/|i', '', $self);
+$self = preg_replace('|^.*/mu-plugins/|i', '', $self);
global $menu, $submenu, $parent_file; //For when admin-header is included from within a function.
+$parent_file = apply_filters("parent_file", $parent_file); // For plugins to move submenu tabs around.
get_admin_page_parent();
@@ -31,112 +34,149 @@ get_admin_page_parent();
* @param bool $submenu_as_parent
*/
function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
- global $self, $parent_file, $submenu_file, $plugin_page, $pagenow;
+ global $self, $parent_file, $submenu_file, $plugin_page, $pagenow, $typenow;
$first = true;
// 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src
foreach ( $menu as $key => $item ) {
$admin_is_parent = false;
$class = array();
+ $aria_attributes = 'tabindex="1"';
+
if ( $first ) {
$class[] = 'wp-first-item';
$first = false;
}
- if ( !empty($submenu[$item[2]]) )
+
+ $submenu_items = false;
+ if ( ! empty( $submenu[$item[2]] ) ) {
$class[] = 'wp-has-submenu';
+ $submenu_items = $submenu[$item[2]];
+ }
- if ( ( $parent_file && $item[2] == $parent_file ) || strcmp($self, $item[2]) == 0 ) {
- if ( !empty($submenu[$item[2]]) )
- $class[] = 'wp-has-current-submenu wp-menu-open';
- else
- $class[] = 'current';
+ if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
+ $class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
+ } else {
+ $class[] = 'wp-not-current-submenu';
+ if ( ! empty( $submenu_items ) )
+ $aria_attributes .= ' aria-haspopup="true"';
}
- if ( isset($item[4]) && ! empty($item[4]) )
+ if ( ! empty( $item[4] ) )
$class[] = $item[4];
$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
- $tabindex = ' tabindex="1"';
- $id = isset($item[5]) && ! empty($item[5]) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+ $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
$img = '';
- if ( isset($item[6]) && ! empty($item[6]) ) {
- if ( 'div' === $item[6] )
- $img = '
';
- else
- $img = '';
- }
- $toggle = '