X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4713a14935b83517997f3c88f808eb41da55033d..58b0523c599c731e868bd4bc05b0d686a98d254f:/wp-admin/menu-header.php diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index 1771fb0f..d73fe9bd 100644 --- 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 = ''; + $aria_hidden = ''; + $is_separator = 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]]; @@ -73,16 +75,23 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { } 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'; - // 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 = ''; @@ -101,9 +110,14 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { $title = wptexturize( $item[0] ); - echo "\n\t