X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/b3ddbea8a296025a672b3c3ddca158dc51ed8080..85ad385665744d9cc3bcd939906309be7268edb3:/wp-admin/menu-header.php
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 54ff1901..6b775f4c 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -34,87 +34,98 @@ 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, $typenow;
-
- $menu_setting_increment = -1;
- $user_settings = get_all_user_settings();
+ global $self, $parent_file, $submenu_file, $plugin_page, $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 = '';
+
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';
- $menu_setting_increment++;
+ $submenu_items = $submenu[$item[2]];
}
if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
- if ( !empty($submenu[$item[2]]) )
- $class[] = 'wp-has-current-submenu wp-menu-open';
- else
- $class[] = 'current';
- } elseif ( ! empty( $submenu[ $item[2] ] ) && isset( $user_settings[ 'm' . $menu_setting_increment ] ) && 'o' == $user_settings[ 'm' . $menu_setting_increment ] ) {
- $class[] = 'wp-menu-open';
+ $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 ( ! empty($item[4]) )
+ if ( ! empty( $item[4] ) )
$class[] = $item[4];
$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
- $tabindex = ' tabindex="1"';
- $id = ! empty($item[5]) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
- $img = '';
- if ( ! empty($item[6]) ) {
- if ( 'div' === $item[6] )
+ $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+ $img = $img_style = $img_class = '';
+
+ // 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 = '';
+
+ if ( 'none' === $item[6] || 'div' === $item[6] ) {
$img = '
';
- else
- $img = '';
+ } elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
+ $img = '
';
+ $img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
+ $img_class = ' svg';
+ } elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
+ $img = '
';
+ $img_class = ' dashicons ' . sanitize_html_class( $item[6] );
+ }
}
- $toggle = '