Ticket #40268: 40268.diff

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

@@ -64 +64 @@
          * @since 3.1.0
          *
          * @global string $s
-         * @global string $mode
          * @global wpdb   $wpdb
          */
         public function prepare_items() {
-                global $s, $mode, $wpdb;
-
-                if ( ! empty( $_REQUEST['mode'] ) ) {
-                        $mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
-                        set_user_setting( 'sites_list_mode', $mode );
-                } else {
-                        $mode = get_user_setting( 'sites_list_mode', 'list' );
-                }
+                global $s, $wpdb;
 
                 $per_page = $this->get_items_per_page( 'sites_network_per_page' );
 
@@ -207 +199 @@
         }
 
         /**
-         * @global string $mode
-         *
-         * @param string $which
-         */
-        protected function pagination( $which ) {
-                global $mode;
-
-                parent::pagination( $which );
-
-                if ( 'top' === $which )
-                        $this->view_switcher( $mode );
-        }
-
-        /**
          * @return array
          */
         public function get_columns() {
@@ -295 +273 @@
          * @since 4.3.0
          * @access public
          *
-         * @global string $mode
-         *
          * @param array $blog Current site.
          */
         public function column_blogname( $blog ) {
-                global $mode;
-
                 $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
                 $blog_states = array();
                 reset( $this->status_list );
@@ -326 +300 @@
                 ?>
                 <a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
                 <?php
-                if ( 'list' !== $mode ) {
                         switch_to_blog( $blog['blog_id'] );
                         echo '<p>';
                         printf(
@@ -337 +310 @@
                         );
                         echo '</p>';
                         restore_current_blog();
-                }
         }
 
         /**
@@ -349 +321 @@
          * @param array $blog Current site.
          */
         public function column_lastupdated( $blog ) {
-                global $mode;
-
-                if ( 'list' === $mode ) {
-                        $date = __( 'Y/m/d' );
-                } else {
                         $date = __( 'Y/m/d g:i:s a' );
-                }
 
                 echo ( $blog['last_updated'] === '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
         }
@@ -369 +335 @@
          * @param array $blog Current site.
          */
         public function column_registered( $blog ) {
-                global $mode;
-
-                if ( 'list' === $mode ) {
-                        $date = __( 'Y/m/d' );
-                } else {
                         $date = __( 'Y/m/d g:i:s a' );
-                }
 
                 if ( $blog['registered'] === '0000-00-00 00:00:00' ) {
                         echo '&#x2014;';
@@ -452 +412 @@
                 do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
         }
 
-        /**
-         *
-         * @global string $mode
-         */
         public function display_rows() {
                 foreach ( $this->items as $blog ) {
                         $blog = $blog->to_array();