--- a/wp/wp-admin/network/sites.php Thu Sep 29 08:06:27 2022 +0200
+++ b/wp/wp-admin/network/sites.php Fri Sep 05 18:40:08 2025 +0200
@@ -28,23 +28,21 @@
'id' => 'overview',
'title' => __( 'Overview' ),
'content' =>
- '<p>' . __( 'Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.' ) . '</p>' .
- '<p>' . __( 'This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.' ) . '</p>' .
+ '<p>' . __( 'Add New Site takes you to the screen for adding a new site to the network. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.' ) . '</p>' .
+ '<p>' . __( 'This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.' ) . '</p>' .
'<p>' . __( 'Hovering over each site reveals seven options (three for the primary site):' ) . '</p>' .
'<ul><li>' . __( 'An Edit link to a separate Edit Site screen.' ) . '</li>' .
'<li>' . __( 'Dashboard leads to the Dashboard for that site.' ) . '</li>' .
'<li>' . __( 'Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.' ) . '</li>' .
- '<li>' . __( 'Delete which is a permanent action after the confirmation screens.' ) . '</li>' .
- '<li>' . __( 'Visit to go to the front-end site live.' ) . '</li></ul>' .
- '<p>' . __( 'The site ID is used internally, and is not shown on the front end of the site or to users/viewers.' ) . '</p>' .
- '<p>' . __( 'Clicking on bold headings can re-sort this table.' ) . '</p>',
+ '<li>' . __( 'Delete which is a permanent action after the confirmation screen.' ) . '</li>' .
+ '<li>' . __( 'Visit to go to the front-end of the live site.' ) . '</li></ul>',
)
);
get_current_screen()->set_help_sidebar(
'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
- '<p>' . __( '<a href="https://wordpress.org/support/article/network-admin-sites-screen/">Documentation on Site Management</a>' ) . '</p>' .
- '<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+ '<p>' . __( '<a href="https://developer.wordpress.org/advanced-administration/multisite/admin/#network-admin-sites-screen">Documentation on Site Management</a>' ) . '</p>' .
+ '<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support forums</a>' ) . '</p>'
);
get_current_screen()->set_screen_reader_content(
@@ -102,7 +100,7 @@
header( 'Content-Type: text/html; charset=utf-8' );
}
- if ( get_network()->site_id == $id ) {
+ if ( is_main_site( $id ) ) {
wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
}
@@ -118,8 +116,20 @@
<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
<input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr( wp_get_referer() ); ?>" />
<?php wp_nonce_field( $site_action . '_' . $id, '_wpnonce', false ); ?>
- <p><?php printf( $manage_actions[ $site_action ], $site_address ); ?></p>
- <?php submit_button( __( 'Confirm' ), 'primary' ); ?>
+ <?php
+ if ( 'deleteblog' === $site_action ) {
+ $submit = __( 'Delete this site permanently' );
+ ?>
+ <div class="notice notice-warning inline">
+ <p><?php _e( 'Deleting a site is a permanent action that cannot be undone. This will delete the entire site and its uploads directory.' ); ?>
+ </div>
+ <?php
+ } else {
+ $submit = __( 'Confirm' );
+ }
+ ?>
+ <p><?php printf( $manage_actions[ $site_action ], "<strong>{$site_address}</strong>" ); ?></p>
+ <?php submit_button( $submit, 'primary' ); ?>
</form>
</div>
<?php
@@ -142,7 +152,7 @@
}
$updated_action = 'not_deleted';
- if ( '0' != $id && get_network()->site_id != $id && current_user_can( 'delete_site', $id ) ) {
+ if ( 0 !== $id && ! is_main_site( $id ) && current_user_can( 'delete_site', $id ) ) {
wpmu_delete_blog( $id, true );
$updated_action = 'delete';
}
@@ -154,7 +164,7 @@
foreach ( (array) $_POST['site_ids'] as $site_id ) {
$site_id = (int) $site_id;
- if ( get_network()->site_id == $site_id ) {
+ if ( is_main_site( $site_id ) ) {
continue;
}
@@ -181,8 +191,10 @@
if ( isset( $_POST['action'] ) && isset( $_POST['allblogs'] ) ) {
$doaction = $_POST['action'];
- foreach ( (array) $_POST['allblogs'] as $key => $val ) {
- if ( '0' != $val && get_network()->site_id != $val ) {
+ foreach ( (array) $_POST['allblogs'] as $site_id ) {
+ $site_id = (int) $site_id;
+
+ if ( 0 !== $site_id && ! is_main_site( $site_id ) ) {
switch ( $doaction ) {
case 'delete':
require_once ABSPATH . 'wp-admin/admin-header.php';
@@ -197,12 +209,14 @@
<ul class="ul-disc">
<?php
foreach ( $_POST['allblogs'] as $site_id ) :
+ $site_id = (int) $site_id;
+
$site = get_site( $site_id );
$site_address = untrailingslashit( $site->domain . $site->path );
?>
<li>
<?php echo $site_address; ?>
- <input type="hidden" name="site_ids[]" value="<?php echo (int) $site_id; ?>" />
+ <input type="hidden" name="site_ids[]" value="<?php echo esc_attr( $site_id ); ?>" />
</li>
<?php endforeach; ?>
</ul>
@@ -217,7 +231,7 @@
case 'spam':
case 'notspam':
$updated_action = ( 'spam' === $doaction ) ? 'all_spam' : 'all_notspam';
- update_blog_status( $val, 'spam', ( 'spam' === $doaction ) ? '1' : '0' );
+ update_blog_status( $site_id, 'spam', ( 'spam' === $doaction ) ? '1' : '0' );
break;
}
} else {
@@ -354,7 +368,14 @@
}
if ( ! empty( $msg ) ) {
- $msg = '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+ $msg = wp_get_admin_notice(
+ $msg,
+ array(
+ 'type' => 'success',
+ 'dismissible' => true,
+ 'id' => 'message',
+ )
+ );
}
}
@@ -367,7 +388,7 @@
<h1 class="wp-heading-inline"><?php _e( 'Sites' ); ?></h1>
<?php if ( current_user_can( 'create_sites' ) ) : ?>
- <a href="<?php echo esc_url( network_admin_url( 'site-new.php' ) ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
+ <a href="<?php echo esc_url( network_admin_url( 'site-new.php' ) ); ?>" class="page-title-action"><?php echo esc_html__( 'Add New Site' ); ?></a>
<?php endif; ?>
<?php