Wordpress 4.6

[autoinstalls/wordpress.git] / wp-admin / ms-delete-site.php

diff --git a/wp-admin/ms-delete-site.php b/wp-admin/ms-delete-site.php
index af8a5e05dc07c2d563dbf55f5388bfeab927d728..9424ae19702bac6b9e461def14b3e3e938f3d2db 100644 (file)
--- a/wp-admin/ms-delete-site.php
+++ b/wp-admin/ms-delete-site.php
@@ -13,10 +13,10 @@ if ( !is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( ! current_user_can( 'delete_site' ) )
-       wp_die(__( 'You do not have sufficient permissions to delete this 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 {
@@ -32,7 +32,7 @@ $parent_file = 'tools.php';
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 echo '<div class="wrap">';
-echo '<h2>' . esc_html( $title ) . '</h2>';
+echo '<h1>' . esc_html( $title ) . '</h1>';
 
 if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {
        check_admin_referer( 'delete-blog' );
@@ -42,6 +42,7 @@ if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_P
 
        $url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
 
+       /* 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
@@ -59,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
         *
@@ -74,7 +75,7 @@ Webmaster
        wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
        ?>
 
-       <p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked. ') ?></p>
+       <p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked.' ) ?></p>
 
 <?php } else {
        ?>