diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 825854e16..518ad4dc5 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -44,63 +44,60 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
foreach ( $menu as $key => $item ) {
$admin_is_parent = false;
$class = array();
+
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]];
$menu_setting_increment++;
}
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';
+ $class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
} else {
$class[] = 'wp-not-current-submenu';
}
- 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] ) . '"' : '';
+ $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
$img = '';
- if ( ! empty($item[6]) ) {
- if ( 'div' === $item[6] )
- $img = '
';
- else
- $img = '';
- }
+ if ( ! empty( $item[6] ) )
+ $img = ( 'div' === $item[6] ) ? '
' : '';
$arrow = '
';
- $title = wptexturize($item[0]);
+ $title = wptexturize( $item[0] );
echo "\n\t";
if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
echo '';
- } elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
- $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
- $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
- $menu_file = $submenu[$item[2]][0][2];
- if ( false !== $pos = strpos($menu_file, '?') )
- $menu_file = substr($menu_file, 0, $pos);
- if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") ) || !empty($menu_hook)) {
+ } elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
+ $submenu_items = array_values( $submenu_items ); // Re-index.
+ $menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
+ $menu_file = $submenu_items[0][2];
+ if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+ $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";
}
- } else if ( !empty($item[2]) && current_user_can($item[1]) ) {
- $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+ } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
+ $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
$menu_file = $item[2];
- if ( false !== $pos = strpos($menu_file, '?') )
- $menu_file = substr($menu_file, 0, $pos);
- if ( ('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") || !empty($menu_hook) ) {
+ if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+ $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]}";
} else {
@@ -108,12 +105,12 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
}
}
- if ( !empty($submenu[$item[2]]) ) {
+ if ( ! empty( $submenu_items ) ) {
echo "\n\t