Changeset 60358 for trunk/src/wp-admin/network/sites.php

Timestamp:

06/27/2025 03:07:29 PM (5 months ago)

Author:

johnbillion

Message:

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

File:

• trunk/src/wp-admin/network/sites.php (modified) (10 diffs)

trunk/src/wp-admin/network/sites.php

@@ -34 +34 @@
             '<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 screen.' ) . '</li>' .
+            '<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>' .
             '<li>' . __( 'Visit to go to the front-end of the live site.' ) . '</li></ul>',
     )
@@ -62 +62 @@
     $manage_actions = array(
         /* translators: %s: Site URL. */
-        'activateblog'   => __( 'You are about to activate the site %s.' ),
-        /* translators: %s: Site URL. */
-        'deactivateblog' => __( 'You are about to deactivate the site %s.' ),
+        'activateblog'   => __( 'You are about to remove the deletion flag from the site %s.' ),
+        /* translators: %s: Site URL. */
+        'deactivateblog' => __( 'You are about to flag the site %s for deletion.' ),
         /* translators: %s: Site URL. */
         'unarchiveblog'  => __( 'You are about to unarchive the site %s.' ),
@@ -107 +107 @@
         $site_details = get_site( $id );
         $site_address = untrailingslashit( $site_details->domain . $site_details->path );
+        $submit       = __( 'Confirm' );
 
         require_once ABSPATH . 'wp-admin/admin-header.php';
@@ -125 +126 @@
                         </div>
                         <?php
-                    } else {
-                        $submit = __( 'Confirm' );
+                    } 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
                     }
                     ?>
@@ -206 +217 @@
                                         <input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr( wp_get_referer() ); ?>" />
                                         <?php wp_nonce_field( 'ms-delete-sites', '_wpnonce', false ); ?>
+                                        <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>
                                         <p><?php _e( 'You are about to delete the following sites:' ); ?></p>
                                         <ul class="ul-disc">
@@ -221 +235 @@
                                             <?php endforeach; ?>
                                         </ul>
-                                        <?php submit_button( __( 'Confirm' ), 'primary' ); ?>
+                                        <?php submit_button( __( 'Delete these sites permanently' ), 'primary' ); ?>
                                     </form>
                                 </div>
@@ -272 +286 @@
 
             /**
-             * Fires after a network site is activated.
+             * Fires after a network site has its deletion flag removed.
              *
              * @since MU (3.0.0)
              *
-             * @param int $id The ID of the activated site.
+             * @param int $id The ID of the reactivated site.
              */
             do_action( 'activate_blog', $id );
@@ -283 +297 @@
         case 'deactivateblog':
             /**
-             * Fires before a network site is deactivated.
+             * Fires before a network site is flagged for deletion.
              *
              * @since MU (3.0.0)
              *
-             * @param int $id The ID of the site being deactivated.
+             * @param int $id The ID of the site being flagged for deletion.
              */
             do_action( 'deactivate_blog', $id );
@@ -327 +341 @@
             break;
         case 'all_delete':
-            $msg = __( 'Sites deleted.' );
+            $msg = __( 'Sites permanently deleted.' );
             break;
         case 'delete':
-            $msg = __( 'Site deleted.' );
+            $msg = __( 'Site permanently deleted.' );
             break;
         case 'not_deleted':
@@ -342 +356 @@
             break;
         case 'activateblog':
-            $msg = __( 'Site activated.' );
+            $msg = __( 'Site deletion flag removed.' );
             break;
         case 'deactivateblog':
-            $msg = __( 'Site deactivated.' );
+            $msg = __( 'Site flagged for deletion.' );
             break;
         case 'unspamblog':