Ticket #31217: 31217-ms-delete-site.diff

wp-admin/ms-delete-site.php

@@ -26 +26 @@
 }
 
 $blog = get_blog_details();
+$user = wp_get_current_user();
 
 $title = __( 'Delete Site' );
 $parent_file = 'tools.php';
@@ -42 +43 @@
 
         $url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
 
-        $content = __( "Dear User,
+        $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###
@@ -55 +57 @@
 
 Thanks for using the site,
 Webmaster
+
 ###SITE_NAME###" );
+
         /**
          * Filter the email content sent when a site in a Multisite network is deleted.
          *
@@ -67 +71 @@
 
         $content = str_replace( '###URL_DELETE###', $url_delete, $content );
         $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
+        $content = str_replace( '###USERNAME###', $user->user_login, $content );
 
         wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
         ?>