From 6f4e407208e696469b8ada100884c13eab9d4efc Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Tue, 19 May 2015 16:59:40 +0000 Subject: [PATCH] Move network update submenu items to the Network Dashboard menu item Provides parity with the placement of the "Updates" submenu item in single site. props Ipstenu. fixes #32431. git-svn-id: https://develop.svn.wordpress.org/trunk@32514 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/network/menu.php | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/wp-admin/network/menu.php b/src/wp-admin/network/menu.php index bb28bff383..5e0fea86ac 100644 --- a/src/wp-admin/network/menu.php +++ b/src/wp-admin/network/menu.php @@ -10,6 +10,17 @@ /* translators: Network menu item */ $menu[2] = array(__('Dashboard'), 'manage_network', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard'); +$submenu['index.php'][0] = array( __( 'Home' ), 'read', 'index.php' ); + +$update_data = wp_get_update_data(); +if ( $update_data['counts']['total'] ) { + $submenu['index.php'][10] = array( sprintf( __( 'Updates %s' ), "" . number_format_i18n( $update_data['counts']['total'] ) . "" ), 'update_core', 'update-core.php' ); +} else { + $submenu['index.php'][10] = array( __( 'Updates' ), 'update_core', 'update-core.php' ); +} + +$submenu['index.php'][15] = array( __( 'Upgrade Network' ), 'manage_network', 'upgrade.php' ); + $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' ); /* translators: Sites menu item */ @@ -21,8 +32,6 @@ $menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-to $submenu['users.php'][5] = array( __('All Users'), 'manage_network_users', 'users.php' ); $submenu['users.php'][10] = array( _x('Add New', 'user'), 'create_users', 'user-new.php' ); -$update_data = wp_get_update_data(); - if ( current_user_can( 'update_themes' ) && $update_data['counts']['themes'] ) { $menu[15] = array(sprintf( __( 'Themes %s' ), "" . number_format_i18n( $update_data['counts']['themes'] ) . "" ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' ); } else { @@ -46,18 +55,8 @@ if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTI $submenu['settings.php'][5] = array( __('Network Settings'), 'manage_network_options', 'settings.php' ); $submenu['settings.php'][10] = array( __('Network Setup'), 'manage_network_options', 'setup.php' ); } - -if ( $update_data['counts']['total'] ) { - $menu[30] = array( sprintf( __( 'Updates %s' ), "" . number_format_i18n($update_data['counts']['total']) . "" ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'dashicons-admin-tools' ); -} else { - $menu[30] = array( __( 'Updates' ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'dashicons-admin-tools' ); -} - unset($update_data); -$submenu[ 'upgrade.php' ][10] = array( __( 'Available Updates' ), 'update_core', 'update-core.php' ); -$submenu[ 'upgrade.php' ][15] = array( __( 'Upgrade Network' ), 'manage_network', 'upgrade.php' ); - $menu[99] = array( '', 'exist', 'separator-last', '', 'wp-menu-separator' ); -require_once(ABSPATH . 'wp-admin/includes/menu.php'); +require_once(ABSPATH . 'wp-admin/includes/menu.php'); \ No newline at end of file