Ticket #36432: patch-36432.diff

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

@@ -108 +108 @@
                 if ( empty($s) ) {
                         // Nothing to do.
                 } elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) ||
-                                        preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-                                        preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-                                        preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
+                           preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
+                           preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
+                           preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
                         // IPv4 address
                         $sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
                         $reg_blog_ids = $wpdb->get_col( $sql );
@@ -225 +225 @@
          */
         public function get_columns() {
                 $sites_columns = array(
-                        'cb'          => '<input type="checkbox" />',
-                        'blogname'    => __( 'URL' ),
-                        'lastupdated' => __( 'Last Updated' ),
-                        'registered'  => _x( 'Registered', 'site' ),
-                        'users'       => __( 'Users' ),
+                        'cb'              => '<input type="checkbox" />',
+                        'blog_id'         => __( 'ID' ),
+                        'blogname'        => __( 'URL' ),
+                        'lastupdated'     => __( 'Last Updated' ),
+                        'registered'      => _x( 'Registered', 'site' ),
+                        'users'           => __( 'Users' ),
+                        'activated_theme' => _x( 'Activated Theme', 'site' ),
                 );
 
                 if ( has_filter( 'wpmublogsaction' ) ) {
@@ -241 +243 @@
                  *
                  * @since MU
                  *
-                 * @param array $sites_columns An array of displayed site columns. Default 'cb',
-                 *                             'blogname', 'lastupdated', 'registered', 'users'.
+                 * @param array $sites_columns An array of displayed site columns. Default 'id', 'cb',
+                 *                             'blogname', 'lastupdated', 'registered', 'users', 'activated theme'.
                  */
                 return apply_filters( 'wpmu_blogs_columns', $sites_columns );
         }
@@ -252 +254 @@
          */
         protected function get_sortable_columns() {
                 return array(
+                        'blog_id'     => 'blog_id',
                         'blogname'    => 'blogname',
                         'lastupdated' => 'lastupdated',
                         'registered'  => 'blog_id',
@@ -269 +272 @@
         public function column_cb( $blog ) {
                 if ( ! is_main_site( $blog['blog_id'] ) ) :
                         $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
-                ?>
+                        ?>
                         <label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>"><?php
                                 printf( __( 'Select %s' ), $blogname );
-                        ?></label>
+                                ?></label>
                         <input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
                 <?php endif;
         }
 
         /**
-         * Handles the ID column output.
+         * Handles the checkbox column output.
          *
-         * @since 4.4.0
+         * @since 4.3.0
          * @access public
          *
          * @param array $blog Current site.
@@ -333 +336 @@
                         switch_to_blog( $blog['blog_id'] );
                         echo '<p>';
                         printf(
-                                /* translators: 1: site name, 2: site tagline. */
+                        /* translators: 1: site name, 2: site tagline. */
                                 __( '%1$s &#8211; %2$s' ),
                                 get_option( 'blogname' ),
                                 '<em>' . get_option( 'blogdescription ' ) . '</em>'
@@ -460 +463 @@
         }
 
         /**
+         * Handles the checkbox column output.
+         *
+         * @param array $blog Current site.
+         */
+        public function column_blog_id( $blog ) {
+                echo $blog['blog_id'];
+        }
+
+        /**
+         * Handles the Activated Theme column output.
+         *
+         * @param array $blog Current site.
+         */
+        public function column_activated_theme( $blog ) {
+                $activated_theme = get_blog_option( $blog['blog_id'], 'current_theme' );
+                if ( empty( $activated_theme ) ) {
+                        $activated_theme = _x( 'No theme activated.', 'site' );
+                }
+
+                echo $activated_theme;
+        }
+
+        /**
          *
          * @global string $mode
          */