IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code is Poetry.

Browse Source 
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.


Built from https://develop.svn.wordpress.org/trunk@42343


git-svn-id: http://core.svn.wordpress.org/trunk@42172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast
2017-11-30 23:11:00 +00:00
parent 62be7ad218
commit aaf99e6913
610 changed files with 55731 additions and 43711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
wp-admin/ms-delete-site.php
View File

@@ -9,11 +9,13 @@
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( !is_multisite() )
if ( ! is_multisite() ) {
wp_die( __( 'Multisite support is not enabled.' ) );
}
if ( ! current_user_can( 'delete_site' ) )
wp_die(__( 'Sorry, you are not allowed 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 ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
@@ -27,7 +29,7 @@ if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' )
$blog = get_site();
$user = wp_get_current_user();
$title = __( 'Delete Site' );
$title = __( 'Delete Site' );
$parent_file = 'tools.php';
require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -45,7 +47,8 @@ if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_P
$switched_locale = switch_to_locale( get_locale() );
/* translators: Do not translate USERNAME, URL_DELETE, SITE_NAME: those are placeholders. */
$content = __( "Howdy ###USERNAME###,
$content = __(
"Howdy ###USERNAME###,
You recently clicked the 'Delete Site' link on your site and filled in a
form on that page.
@@ -60,7 +63,8 @@ are gone forever.)
Thanks for using the site,
Webmaster
###SITE_NAME###" );
###SITE_NAME###"
);
/**
* Filters the email content sent when a site in a Multisite network is deleted.
*
@@ -74,33 +78,36 @@ Webmaster
$content = str_replace( '###URL_DELETE###', $url_delete, $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 );
wp_mail( get_option( 'admin_email' ), '[ ' . wp_specialchars_decode( get_option( 'blogname' ) ) . ' ] ' . __( 'Delete My Site' ), $content );
if ( $switched_locale ) {
restore_previous_locale();
}
?>
<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 {
<?php
} else {
?>
<p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), get_network()->site_name); ?></p>
<p><?php _e( 'Remember, once deleted your site cannot be restored.' ) ?></p>
<p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.' ), get_network()->site_name ); ?></p>
<p><?php _e( 'Remember, once deleted your site cannot be restored.' ); ?></p>
<form method="post" name="deletedirect">
<?php wp_nonce_field( 'delete-blog' ) ?>
<?php wp_nonce_field( 'delete-blog' ); ?>
<input type="hidden" name="action" value="deleteblog" />
<p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php
<p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong>
<?php
printf(
/* translators: %s: site address */
__( "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." ),
$blog->domain . $blog->path
);
?></strong></label></p>
?>
</strong></label></p>
<?php submit_button( __( 'Delete My Site Permanently' ) ); ?>
</form>
<?php
<?php
}
echo '</div>';