<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[60358] trunk/src: Networks and Sites: Correct and improve terminology relating to deactivated, deleted, and archived sites on a Multisite installation.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/60358">60358</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/60358","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-06-27 15:07:29 +0000 (Fri, 27 Jun 2025)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Networks and Sites: Correct and improve terminology relating to deactivated, deleted, and archived sites on a Multisite installation.
* Deleting a site is permanent action, so the terminology around site deletion has been updated to reflect that.
* Site deactivation has been renamed to "Flag for Deletion", and a site with this status is no longer incorrectly shown as "Deleted".
* Extra helper text has been added to the screen shown when changing a site's status to make the effects clearer to Super Admins.
Props kawauso, ryan_b, wonderboymusic, nacin, DrewAPicture, martythornley, SergeyBiryukov, jeremyfelt, ideag, jorbin, sukhendu2002, johnbillion, realloc.
Fixes <a href="https://core.trac.wordpress.org/ticket/15801">#15801</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteinfophp">trunk/src/wp-admin/network/site-info.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesphp">trunk/src/wp-admin/network/sites.php</a></li>
<li><a href="#trunksrcwpincludesclasswpsitephp">trunk/src/wp-includes/class-wp-site.php</a></li>
<li><a href="#trunksrcwpincludesmssitephp">trunk/src/wp-includes/ms-site.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2025-06-27 14:25:07 UTC (rev 60357)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2025-06-27 15:07:29 UTC (rev 60358)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->status_list = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'archived' => array( 'site-archived', __( 'Archived' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'spam' => array( 'site-spammed', _x( 'Spam', 'site' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'deleted' => array( 'site-deleted', __( 'Deleted' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'deleted' => array( 'site-deleted', __( 'Flagged for Deletion' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mature' => array( 'site-mature', __( 'Mature' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,8 +256,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of sites. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'deleted' => _n_noop(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Deleted <span class="count">(%s)</span>',
- 'Deleted <span class="count">(%s)</span>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Flagged for Deletion <span class="count">(%s)</span>',
+ 'Flagged for Deletion <span class="count">(%s)</span>'
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -667,7 +667,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $site_states An array of site states. Default 'Main',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'Archived', 'Mature', 'Spam', 'Deleted'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'Archived', 'Mature', 'Spam', 'Flagged for Deletion'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Site $site The current site object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $site_states = apply_filters( 'display_site_states', $site_states, $_site );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,7 +758,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'activateblog_' . $blog['blog_id']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _x( 'Activate', 'site' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _x( 'Remove Deletion Flag', 'site' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['deactivate'] = sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -769,7 +769,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'deactivateblog_' . $blog['blog_id']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Deactivate' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Flag for Deletion' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -830,7 +830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'deleteblog_' . $blog['blog_id']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Delete' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Delete Permanently' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -844,9 +844,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the action links displayed for each site in the Sites list table.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The 'Edit', 'Dashboard', 'Delete Permanently', and 'Visit' links are displayed by
</ins><span class="cx" style="display: block; padding: 0 10px"> * default for each site. The site's status determines whether to show the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'Remove Deletion Flag' or 'Flag for Deletion' link, 'Unarchive' or 'Archive' links, and
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'Not Spam' or 'Spam' link for each site.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span></span></pre></div>
<a id="trunksrcwpadminmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu.php 2025-06-27 14:25:07 UTC (rev 60357)
+++ trunk/src/wp-admin/menu.php 2025-06-27 15:07:29 UTC (rev 60358)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,7 +378,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu['tools.php'][20] = array( sprintf( __( 'Site Health %s' ), $site_health_count ), 'view_site_health_checks', 'site-health.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu['tools.php'][25] = array( __( 'Export Personal Data' ), 'export_others_personal_data', 'export-personal-data.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu['tools.php'][30] = array( __( 'Erase Personal Data' ), 'erase_others_personal_data', 'erase-personal-data.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_multisite() && ! is_main_site() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( is_multisite() && ! is_main_site() && '1' !== get_site()->deleted ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $submenu['tools.php'][35] = array( __( 'Delete Site' ), 'delete_site', 'ms-delete-site.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-info.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-info.php 2025-06-27 14:25:07 UTC (rev 60357)
+++ trunk/src/wp-admin/network/site-info.php 2025-06-27 15:07:29 UTC (rev 60358)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $is_main_site ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attribute_fields['archived'] = __( 'Archived' );
</span><span class="cx" style="display: block; padding: 0 10px"> $attribute_fields['spam'] = _x( 'Spam', 'site' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attribute_fields['deleted'] = __( 'Deleted' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attribute_fields['deleted'] = __( 'Flagged for Deletion' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $attribute_fields['mature'] = __( 'Mature' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/sites.php 2025-06-27 14:25:07 UTC (rev 60357)
+++ trunk/src/wp-admin/network/sites.php 2025-06-27 15:07:29 UTC (rev 60358)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,8 +33,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Hovering over each site reveals seven options (three for the primary site):' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<ul><li>' . __( 'An Edit link to a separate Edit Site screen.' ) . '</li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<li>' . __( 'Dashboard leads to the Dashboard for that site.' ) . '</li>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<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 screen.' ) . '</li>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<li>' . __( 'Flag for Deletion, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.' ) . '</li>' .
+ '<li>' . __( 'Delete Permanently which is a permanent action after the confirmation screen.' ) . '</li>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<li>' . __( 'Visit to go to the front-end of the live site.' ) . '</li></ul>',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,9 +61,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // A list of valid actions and their associated messaging for confirmation output.
</span><span class="cx" style="display: block; padding: 0 10px"> $manage_actions = array(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Site URL. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'activateblog' => __( 'You are about to activate the site %s.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'activateblog' => __( 'You are about to remove the deletion flag from the site %s.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Site URL. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'deactivateblog' => __( 'You are about to deactivate the site %s.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'deactivateblog' => __( 'You are about to flag the site %s for deletion.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Site URL. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'unarchiveblog' => __( 'You are about to unarchive the site %s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Site URL. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,6 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_details = get_site( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $site_address = untrailingslashit( $site_details->domain . $site_details->path );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $submit = __( 'Confirm' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/admin-header.php';
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,8 +125,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Deleting a site is a permanent action that cannot be undone. This will delete the entire site and its uploads directory.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $submit = __( 'Confirm' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'archiveblog' === $site_action ) {
+ ?>
+ <div class="notice notice-warning inline">
+ <p><?php _e( 'Archiving a site makes the site unavailable to its users and visitors. This is a reversible action.' ); ?>
+ </div>
+ <?php
+ } elseif ( 'deactivateblog' === $site_action ) {
+ ?>
+ <div class="notice notice-warning inline">
+ <p><?php _e( 'Flagging a site for deletion makes the site unavailable to its users and visitors. This is a reversible action. A super admin can permanently delete the site at a later date.' ); ?>
+ </div>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( $manage_actions[ $site_action ], "<strong>{$site_address}</strong>" ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,6 +216,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="delete_sites" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr( wp_get_referer() ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'ms-delete-sites', '_wpnonce', false ); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'You are about to delete the following sites:' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="ul-disc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Confirm' ), 'primary' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( __( 'Delete these sites permanently' ), 'primary' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,11 +285,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $id, 'deleted', '0' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires after a network site is activated.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires after a network site has its deletion flag removed.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (3.0.0)
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $id The ID of the activated site.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $id The ID of the reactivated site.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'activate_blog', $id );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,11 +296,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'deactivateblog':
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires before a network site is deactivated.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires before a network site is flagged for deletion.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (3.0.0)
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $id The ID of the site being deactivated.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $id The ID of the site being flagged for deletion.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'deactivate_blog', $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,10 +340,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $msg = __( 'Sites marked as spam.' );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'all_delete':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $msg = __( 'Sites deleted.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $msg = __( 'Sites permanently deleted.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $msg = __( 'Site deleted.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $msg = __( 'Site permanently deleted.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'not_deleted':
</span><span class="cx" style="display: block; padding: 0 10px"> $msg = __( 'Sorry, you are not allowed to delete that site.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,10 +355,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $msg = __( 'Site unarchived.' );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'activateblog':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $msg = __( 'Site activated.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $msg = __( 'Site deletion flag removed.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'deactivateblog':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $msg = __( 'Site deactivated.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $msg = __( 'Site flagged for deletion.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'unspamblog':
</span><span class="cx" style="display: block; padding: 0 10px"> $msg = __( 'Site removed from spam.' );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpsitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-site.php 2025-06-27 14:25:07 UTC (rev 60357)
+++ trunk/src/wp-includes/class-wp-site.php 2025-06-27 15:07:29 UTC (rev 60358)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $spam = '0';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Whether the site should be treated as deleted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Whether the site should be treated as flagged for deletion.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * A numeric string, for compatibility reasons.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesmssitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-site.php 2025-06-27 14:25:07 UTC (rev 60357)
+++ trunk/src/wp-includes/ms-site.php 2025-06-27 15:07:29 UTC (rev 60358)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1243,7 +1243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '1' === $new_site->deleted ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires when the 'deleted' status is added to a site.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires when the 'flagged for deletion' status is added to a site.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1253,7 +1253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires when the 'deleted' status is removed from a site.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires when the 'flagged for deletion' status is removed from a site.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2025-06-27 14:25:07 UTC (rev 60357)
+++ trunk/src/wp-includes/user.php 2025-06-27 15:07:29 UTC (rev 60358)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1126,7 +1126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object[] $sites An array of site objects belonging to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id User ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $all Whether the returned sites array should contain all sites, including
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * those marked 'deleted', 'archived', or 'spam'. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * those flagged for deletion, archived, or marked as spam.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'get_blogs_of_user', $sites, $user_id, $all );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>