Changeset 60358

Timestamp:

06/27/2025 03:07:29 PM (3 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

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-ms-sites-list-table.php (modified) (7 diffs)
• wp-admin/menu.php (modified) (1 diff)
• wp-admin/network/site-info.php (modified) (1 diff)
• wp-admin/network/sites.php (modified) (10 diffs)
• wp-includes/class-wp-site.php (modified) (1 diff)
• wp-includes/ms-site.php (modified) (2 diffs)
• wp-includes/user.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -38 +38 @@
             'archived' => array( 'site-archived', __( 'Archived' ) ),
             'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
-            'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
+            'deleted'  => array( 'site-deleted', __( 'Flagged for Deletion' ) ),
             'mature'   => array( 'site-mature', __( 'Mature' ) ),
         );
@@ -257 +257 @@
             /* translators: %s: Number of sites. */
             'deleted'  => _n_noop(
-                'Deleted <span class="count">(%s)</span>',
-                'Deleted <span class="count">(%s)</span>'
+                'Flagged for Deletion <span class="count">(%s)</span>',
+                'Flagged for Deletion <span class="count">(%s)</span>'
             ),
         );
@@ -668 +668 @@
          *
          * @param string[] $site_states An array of site states. Default 'Main',
-         *                              'Archived', 'Mature', 'Spam', 'Deleted'.
+         *                              'Archived', 'Mature', 'Spam', 'Flagged for Deletion'.
          * @param WP_Site  $site        The current site object.
          */
@@ -759 +759 @@
                         )
                     ),
-                    _x( 'Activate', 'site' )
+                    _x( 'Remove Deletion Flag', 'site' )
                 );
             } else {
@@ -770 +770 @@
                         )
                     ),
-                    __( 'Deactivate' )
+                    __( 'Flag for Deletion' )
                 );
             }
@@ -831 +831 @@
                         )
                     ),
-                    __( 'Delete' )
+                    __( 'Delete Permanently' )
                 );
             }
@@ -845 +845 @@
          * Filters the action links displayed for each site in the Sites list table.
          *
-         * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by
+         * The 'Edit', 'Dashboard', 'Delete Permanently', and 'Visit' links are displayed by
          * default for each site. The site's status determines whether to show the
-         * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and
+         * 'Remove Deletion Flag' or 'Flag for Deletion' link, 'Unarchive' or 'Archive' links, and
          * 'Not Spam' or 'Spam' link for each site.
          *

trunk/src/wp-admin/menu.php

@@ -379 +379 @@
     $submenu['tools.php'][25] = array( __( 'Export Personal Data' ), 'export_others_personal_data', 'export-personal-data.php' );
     $submenu['tools.php'][30] = array( __( 'Erase Personal Data' ), 'erase_others_personal_data', 'erase-personal-data.php' );
-if ( is_multisite() && ! is_main_site() ) {
+if ( is_multisite() && ! is_main_site() && '1' !== get_site()->deleted ) {
     $submenu['tools.php'][35] = array( __( 'Delete Site' ), 'delete_site', 'ms-delete-site.php' );
 }

trunk/src/wp-admin/network/site-info.php

@@ -201 +201 @@
             $attribute_fields['archived'] = __( 'Archived' );
             $attribute_fields['spam']     = _x( 'Spam', 'site' );
-            $attribute_fields['deleted']  = __( 'Deleted' );
+            $attribute_fields['deleted']  = __( 'Flagged for Deletion' );
         }
         $attribute_fields['mature'] = __( 'Mature' );

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

trunk/src/wp-includes/class-wp-site.php

@@ -127 +127 @@
 
     /**
-     * Whether the site should be treated as deleted.
+     * Whether the site should be treated as flagged for deletion.
      *
      * A numeric string, for compatibility reasons.

trunk/src/wp-includes/ms-site.php

@@ -1244 +1244 @@
 
             /**
-             * Fires when the 'deleted' status is added to a site.
+             * Fires when the 'flagged for deletion' status is added to a site.
              *
              * @since 3.5.0
@@ -1254 +1254 @@
 
             /**
-             * Fires when the 'deleted' status is removed from a site.
+             * Fires when the 'flagged for deletion' status is removed from a site.
              *
              * @since 3.5.0

trunk/src/wp-includes/user.php

@@ -1127 +1127 @@
      * @param int      $user_id User ID.
      * @param bool     $all     Whether the returned sites array should contain all sites, including
-     *                          those marked 'deleted', 'archived', or 'spam'. Default false.
+     *                          those flagged for deletion, archived, or marked as spam.
      */
     return apply_filters( 'get_blogs_of_user', $sites, $user_id, $all );