Ticket #30470: 30470.2.diff

wp-admin/menu.php

@@ -228 +228 @@
         $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
         $submenu['tools.php'][15] = array( __('Export'), 'export', 'export.php' );
         if ( is_multisite() && !is_main_site() )
-                $submenu['tools.php'][25] = array( __('Delete Site'), 'manage_options', 'ms-delete-site.php' );
+                $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');
 

wp-admin/ms-delete-site.php

@@ -12 +12 @@
 if ( !is_multisite() )
         wp_die( __( 'Multisite support is not enabled.' ) );
 
-// @todo Create a delete blog cap.
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'delete_site' ) )
         wp_die(__( 'You do not have sufficient permissions to delete this site.'));
 
 if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {

wp-includes/capabilities.php

@@ -1070 +1070 @@
                 else
                         $caps[] = 'edit_users'; // edit_user maps to edit_users.
                 break;
+        case 'delete_site':
+                $caps[] = 'manage_options'; // delete_site maps to manage_options
+                break;
         case 'delete_post':
         case 'delete_page':
                 $post = get_post( $args[0] );