Changeset 40390

Timestamp:

04/07/2017 12:52:24 PM (9 years ago)

Author:

flixos90

Message:

Multisite: Introduce a setup_network capability for setting up multisite.

setup_network is a new meta capability that brings more granular control over the permissions to setup a multisite environment. In a non-multisite environment it falls back to manage_options while in a multisite it falls back to manage_network_options. The introduction of this capability furthermore allows replacing an is_super_admin() check.

Props ashokkumar24 for the original patch.
Fixes #39206. See #37616.

Location:

trunk

Files:

• src/wp-admin/menu.php (modified) (1 diff)
• src/wp-admin/network.php (modified) (1 diff)
• src/wp-admin/network/menu.php (modified) (1 diff)
• src/wp-includes/capabilities.php (modified) (1 diff)
• tests/phpunit/tests/user/capabilities.php (modified) (2 diffs)

trunk/src/wp-admin/menu.php

@@ -245 +245 @@
                 $submenu['tools.php'][25] = array( __('Delete Site'), 'delete_site', 'ms-delete-site.php' );
         if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
-                $submenu['tools.php'][50] = array(__('Network Setup'), 'manage_options', 'network.php');
+                $submenu['tools.php'][50] = array(__('Network Setup'), 'setup_network', 'network.php');
 
 $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );

trunk/src/wp-admin/network.php

@@ -16 +16 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_super_admin() ) {
+if ( ! current_user_can( 'setup_network' ) ) {
         wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
 }

trunk/src/wp-admin/network/menu.php

@@ -54 +54 @@
 if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
         $submenu['settings.php'][5]  = array( __('Network Settings'), 'manage_network_options', 'settings.php' );
-        $submenu['settings.php'][10] = array( __('Network Setup'), 'manage_network_options', 'setup.php' );
+        $submenu['settings.php'][10] = array( __('Network Setup'), 'setup_network', 'setup.php' );
 }
 unset($update_data);

trunk/src/wp-includes/capabilities.php

@@ -481 +481 @@
                 $caps[] = $cap;
                 break;
+        case 'setup_network':
+                if ( is_multisite() ) {
+                        $caps[] = 'manage_network_options';
+                } else {
+                        $caps[] = 'manage_options';
+                }
+                break;
         default:
                 // Handle meta capabilities for custom post types.

trunk/tests/phpunit/tests/user/capabilities.php

@@ -228 +228 @@
                         'delete_site'            => array(),
 
+                        'setup_network'          => array( 'administrator' ),
                         'upload_plugins'         => array( 'administrator' ),
                         'upload_themes'          => array( 'administrator' ),
@@ -255 +256 @@
                         'manage_network_themes'  => array(),
                         'manage_network_options' => array(),
+                        'setup_network'          => array(),
                         'upload_plugins'         => array(),
                         'upload_themes'          => array(),