diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/ms-delete-site.php --- a/wp/wp-admin/ms-delete-site.php Tue Jun 09 11:14:17 2015 +0000 +++ b/wp/wp-admin/ms-delete-site.php Mon Oct 14 17:39:30 2019 +0200 @@ -13,18 +13,18 @@ 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'] ) { - 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 ) ); + if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) { + wpmu_delete_blog( get_current_blog_id() ); + wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), get_network()->site_name ) ); } else { - wp_die( __( "I'm sorry, the link you clicked is stale. Please select another option." ) ); + wp_die( __( 'Sorry, the link you clicked is stale. Please select another option.' ) ); } } -$blog = get_blog_details(); +$blog = get_site(); $user = wp_get_current_user(); $title = __( 'Delete Site' ); @@ -32,7 +32,7 @@ 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,6 +42,9 @@ $url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) ); + $switched_locale = switch_to_locale( get_locale() ); + + /* 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 +62,7 @@ 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 * @@ -69,22 +72,32 @@ $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 ); + $content = str_replace( '###SITE_NAME###', get_network()->site_name, $content ); wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content ); + + if ( $switched_locale ) { + restore_previous_locale(); + } ?> -

+

-

Delete My Site Permanently you will be sent an email with a link in it. Click on this link to delete your site.'), $current_site->site_name); ?>

+

Delete My Site Permanently you will be sent an email with a link in it. Click on this link to delete your site.'), get_network()->site_name); ?>

-

+