Ticket #37684: 37684.02.diff

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

@@ -18 +18 @@
 class WP_MS_Sites_List_Table extends WP_List_Table {
 
         /**
-         * Site status list.
-         *
-         * @since 4.3.0
-         * @access public
-         * @var array
-         */
-        public $status_list;
-
-        /**
          * Constructor.
          *
          * @since 3.1.0
@@ -37 +28 @@
          * @param array $args An associative array of arguments.
          */
         public function __construct( $args = array() ) {
-                $this->status_list = array(
-                        'archived' => array( 'site-archived', __( 'Archived' ) ),
-                        'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
-                        'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
-                        'mature'   => array( 'site-mature', __( 'Mature' ) )
-                );
-
                 parent::__construct( array(
                         'plural' => 'sites',
                         'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
@@ -303 +287 @@
                 global $mode;
 
                 $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
-                $blog_states = array();
-                reset( $this->status_list );
-
-                foreach ( $this->status_list as $status => $col ) {
-                        if ( $blog[ $status ] == 1 ) {
-                                $blog_states[] = $col[1];
-                        }
-                }
-                $blog_state = '';
-                if ( ! empty( $blog_states ) ) {
-                        $state_count = count( $blog_states );
-                        $i = 0;
-                        $blog_state .= ' - ';
-                        foreach ( $blog_states as $state ) {
-                                ++$i;
-                                $sep = ( $i == $state_count ) ? '' : ', ';
-                                $blog_state .= "<span class='post-state'>$state$sep</span>";
-                        }
-                }
-
                 ?>
-                <a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
+                <a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname; ?></a>
                 <?php
+
+                _site_states( $blog );
+
                 if ( 'list' !== $mode ) {
                         switch_to_blog( $blog['blog_id'] );
                         echo '<p>';
@@ -460 +427 @@
                 foreach ( $this->items as $blog ) {
                         $blog = $blog->to_array();
                         $class = '';
-                        reset( $this->status_list );
+                        $statuses = array(
+                                'archived' => array( 'site-archived', __( 'Archived' ) ),
+                                'spam'     => array( 'site-spammed',  _x( 'Spam', 'site' ) ),
+                                'deleted'  => array( 'site-deleted',  __( 'Deleted' ) ),
+                                'mature'   => array( 'site-mature',   __( 'Mature' ) )
+                        );
 
-                        foreach ( $this->status_list as $status => $col ) {
+                        foreach ( $statuses as $status => $col ) {
                                 if ( $blog[ $status ] == 1 ) {
                                         $class = " class='{$col[0]}'";
                                 }

src/wp-admin/includes/template.php

@@ -1793 +1793 @@
 }
 
 /**
+ *
+ * @param WP_Site $site
+ */
+function _site_states( $site ) {
+        $site_states = array();
+
+        // $site is still an array in class-wp-ms-sites-list-table.php
+        $_site = WP_Site::get_instance( $site['blog_id'] );
+
+        if ( is_main_site( $_site->id ) ) {
+                $site_states['deleted'] = __( 'Main' );
+        }
+
+        if ( ! empty( $_site->archived ) ) {
+                $site_states['archived'] = __( 'Archived' );
+        }
+
+        if ( ! empty( $_site->mature ) ) {
+                $site_states['mature'] = __( 'Mature' );
+        }
+
+        if ( ! empty( $_site->spam ) ) {
+                $site_states['spam'] = _x( 'Spam', 'site' );
+        }
+
+        if ( ! empty( $_site->deleted ) ) {
+                $site_states['deleted'] = __( 'Deleted' );
+        }
+
+        /**
+         * Filter the default site display states for items in the Sites list table.
+         *
+         * @since 4.7.0
+         *
+         * @param array $site_states An array of site states. Default 'Main',
+         *                            'Archived', 'Mature', 'Spam', 'Deleted'.
+         */
+        $site_states = apply_filters( 'display_site_states', $site_states );
+
+        if ( ! empty( $site_states ) ) {
+                $state_count = count( $site_states );
+                $i = 0;
+                echo ' — ';
+                foreach ( $site_states as $state ) {
+                        ++$i;
+                        ( $i == $state_count ) ? $sep = '' : $sep = ', ';
+                        echo "<span class='post-state'>{$state}{$sep}</span>";
+                }
+        }
+}
+
+/**
  * Test support for compressing JavaScript from PHP
  *
  * Outputs JavaScript that tests if compression from PHP works as expected