Ticket #39205: 39205.2.diff

src/wp-admin/includes/ms.php

@@ -785 +785 @@
 function site_admin_notice() {
         global $wp_db_version, $pagenow;
 
-        if ( ! is_super_admin() ) {
+        if ( ! current_user_can( 'upgrade_network' ) ) {
                 return false;
         }
 

src/wp-admin/network/menu.php

@@ -19 +19 @@
         $submenu['index.php'][10] = array( __( 'Updates' ), 'update_core', 'update-core.php' );
 }
 
-$submenu['index.php'][15] = array( __( 'Upgrade Network' ), 'manage_network', 'upgrade.php' );
+$submenu['index.php'][15] = array( __( 'Upgrade Network' ), 'upgrade_network', 'upgrade.php' );
 
 $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
 

src/wp-admin/network/upgrade.php

@@ -32 +32 @@
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-if ( ! current_user_can( 'manage_network' ) )
+if ( ! current_user_can( 'upgrade_network' ) ) {
         wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
 echo '<div class="wrap">';
 echo '<h1>' . __( 'Upgrade Network' ) . '</h1>';

src/wp-includes/capabilities.php

@@ -478 +478 @@
         case 'manage_network_plugins':
         case 'manage_network_themes':
         case 'manage_network_options':
+        case 'upgrade_network':
                 $caps[] = $cap;
                 break;
         default:

tests/phpunit/tests/user/capabilities.php

@@ -226 +226 @@
                         'manage_network_themes'  => array(),
                         'manage_network_options' => array(),
                         'delete_site'            => array(),
+                        'upgrade_network'        => array(),
 
                         'upload_plugins'         => array( 'administrator' ),
                         'upload_themes'          => array( 'administrator' ),
@@ -257 +258 @@
                         'upload_plugins'         => array(),
                         'upload_themes'          => array(),
                         'edit_css'               => array(),
+                        'upgrade_network'        => array(),
 
                         'customize'              => array( 'administrator' ),
                         'delete_site'            => array( 'administrator' ),