WordPress 4.1-scripts

[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 7d772c2658325d0cf0c2a8f9ea43de8a051c58f2..00143089e2c584958e4759f8dd9f6efcd99e3536 100644 (file)
--- a/wp-admin/ms-delete-site.php
+++ b/wp-admin/ms-delete-site.php
@@ -7,7 +7,7 @@
  * @since 3.0.0
  */
 
  * @since 3.0.0
  */
 

-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );

 
 if ( !is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( !is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );


@@ -29,10 +29,9 @@ $blog = get_blog_details();
 
 $title = __( 'Delete Site' );
 $parent_file = 'tools.php';
 
 $title = __( 'Delete Site' );
 $parent_file = 'tools.php';

-require_once( './admin-header.php' );
+require_once( ABSPATH . 'wp-admin/admin-header.php' );

 
 echo '<div class="wrap">';
 
 echo '<div class="wrap">';

-screen_icon();

 echo '<h2>' . esc_html( $title ) . '</h2>';
 
 if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {
 echo '<h2>' . esc_html( $title ) . '</h2>';
 
 if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {


@@ -43,7 +42,7 @@ if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_P
 
        $url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
 
 
        $url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
 

-       $content = apply_filters( 'delete_site_email_content', __( "Dear User,
+       $content = __( "Dear User,

 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
 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


@@ -56,12 +55,20 @@ are gone forever.)
 
 Thanks for using the site,
 Webmaster
 
 Thanks for using the site,
 Webmaster

-###SITE_NAME###" ) );
+###SITE_NAME###" );
+       /**
+        * Filter the email content sent when a site in a Multisite network is deleted.
+        *
+        * @since 3.0.0
+        *
+        * @param string $content The email content that will be sent to the user who deleted a site in a Multisite network.
+        */
+       $content = apply_filters( 'delete_site_email_content', $content );

 
        $content = str_replace( '###URL_DELETE###', $url_delete, $content );
        $content = str_replace( '###SITE_NAME###', $current_site->site_name, $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' ), "[ " . get_option( 'blogname' ) . " ] ".__( 'Delete My Site' ), $content );
+       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>


@@ -81,4 +88,4 @@ Webmaster
 }
 echo '</div>';
 
 }
 echo '</div>';
 

-include( './admin-footer.php' );
+include( ABSPATH . 'wp-admin/admin-footer.php' );