X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41578db67d72562346e4dbb2a14889b23d522813..3d39054f012aefe514b3f5509e32f09fc4feda44:/wp-admin/ms-delete-site.php
diff --git a/wp-admin/ms-delete-site.php b/wp-admin/ms-delete-site.php
index 00143089..9424ae19 100644
--- a/wp-admin/ms-delete-site.php
+++ b/wp-admin/ms-delete-site.php
@@ -12,12 +12,11 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
if ( !is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
-// @todo Create a delete blog cap.
-if ( ! current_user_can( 'manage_options' ) )
- wp_die(__( 'You do not have sufficient permissions to delete this site.'));
+if ( ! current_user_can( 'delete_site' ) )
+ wp_die(__( 'Sorry, you are not allowed to delete this site.'));
if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
- if ( get_option( 'delete_blog_hash' ) == $_GET['h'] ) {
+ if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
wpmu_delete_blog( $wpdb->blogid );
wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), $current_site->site_name ) );
} else {
@@ -26,13 +25,14 @@ if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' )
}
$blog = get_blog_details();
+$user = wp_get_current_user();
$title = __( 'Delete Site' );
$parent_file = 'tools.php';
require_once( ABSPATH . 'wp-admin/admin-header.php' );
echo '
';
-echo '
' . esc_html( $title ) . '
';
+echo '
' . esc_html( $title ) . '
';
if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {
check_admin_referer( 'delete-blog' );
@@ -42,9 +42,12 @@ if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_P
$url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
- $content = __( "Dear User,
+ /* translators: Do not translate USERNAME, URL_DELETE, SITE_NAME: those are placeholders. */
+ $content = __( "Howdy ###USERNAME###,
+
You recently clicked the 'Delete Site' link on your site and filled in a
form on that page.
+
If you really want to delete your site, click the link below. You will not
be asked to confirm again so only click this link if you are absolutely certain:
###URL_DELETE###
@@ -57,7 +60,7 @@ Thanks for using the site,
Webmaster
###SITE_NAME###" );
/**
- * Filter the email content sent when a site in a Multisite network is deleted.
+ * Filters the email content sent when a site in a Multisite network is deleted.
*
* @since 3.0.0
*
@@ -65,13 +68,14 @@ Webmaster
*/
$content = apply_filters( 'delete_site_email_content', $content );
+ $content = str_replace( '###USERNAME###', $user->user_login, $content );
$content = str_replace( '###URL_DELETE###', $url_delete, $content );
$content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
?>
-
+