Ticket #39082: 39082-partial-1.patch

wp-admin/network/menu.php

@@ -27 +27 @@
 $menu[5] = array(__('Sites'), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'dashicons-admin-multisite');
 $submenu['sites.php'][5]  = array( __('All Sites'), 'manage_sites', 'sites.php' );
 $submenu['sites.php'][10]  = array( _x('Add New', 'site'), 'create_sites', 'site-new.php' );
+if ( ! current_user_can( 'manage_sites' ) && current_user_can( 'create_sites' ) ) {
+        $menu[5][2] = 'site-new.php';
+        $submenu['site-new.php'][10]  = $submenu['sites.php'][10];
+        unset( $submenu['sites.php'] );
+}
 
 $menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users');
 $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' );
+if ( ! current_user_can( 'manage_network_users' ) && current_user_can( 'create_users' ) ) {
+        $menu[10][2] = 'user-new.php';
+        $submenu['user-new.php'][10]  = $submenu['users.php'][10];
+        unset( $submenu['users.php'] );
+}
 
 if ( current_user_can( 'update_themes' ) && $update_data['counts']['themes'] ) {
         $menu[15] = array(sprintf( __( 'Themes %s' ), "<span class='update-plugins count-{$update_data['counts']['themes']}'><span class='theme-count'>" . number_format_i18n( $update_data['counts']['themes'] ) . "</span></span>" ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );