Changeset 39494

Timestamp:

12/04/2016 10:06:36 PM (10 years ago)

Author:

johnbillion

Message:

Role/Capability: Don't assign the delete_site capability to anyone on single site installs.

This capability is not relevant on single site installs; it only applies to deleting a site on a multisite installation.

Fixes #38326

Location:

trunk

Files:

• src/wp-includes/capabilities.php (modified) (1 diff)
• tests/phpunit/tests/user/capabilities.php (modified) (1 diff)

trunk/src/wp-includes/capabilities.php

@@ -423 +423 @@
                 break;
         case 'delete_site':
-                $caps[] = 'manage_options';
+                if ( is_multisite() ) {
+                        $caps[] = 'manage_options';
+                } else {
+                        $caps[] = 'do_not_allow';
+                }
                 break;
         case 'edit_term':

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

@@ -226 +226 @@
                         'manage_network_themes'  => array(),
                         'manage_network_options' => array(),
+                        'delete_site'            => array(),
 
                         'upload_plugins'         => array( 'administrator' ),
                         'upload_themes'          => array( 'administrator' ),
                         'customize'              => array( 'administrator' ),
-                        'delete_site'            => array( 'administrator' ),
                         'add_users'              => array( 'administrator' ),