X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..58b0523c599c731e868bd4bc05b0d686a98d254f:/wp-admin/menu-header.php diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index 275cc145..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]]; @@ -80,6 +82,10 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { $img = $img_style = ''; $img_class = ' dashicons-before'; + 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 @@ -104,9 +110,14 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { $title = wptexturize( $item[0] ); - echo "\n\t