Ticket #30470: 30470.diff

src/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 ) {

src/wp-includes/capabilities.php

@@ -1112 +1112 @@
                         }
                 }
                 break;
+        // delete_site defaults to manage_options
+        case 'delete_site':
+                $caps[] = 'manage_options';
+                break;
                 // edit_post breaks down to edit_posts, edit_published_posts, or
                 // edit_others_posts
         case 'edit_post':