Ticket #40267: 40267.diff

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

@@ -29 +29 @@
          * @global string $usersearch
          * @global string $role
          * @global wpdb   $wpdb
-         * @global string $mode
          */
         public function prepare_items() {
-                global $usersearch, $role, $wpdb, $mode;
+                global $usersearch, $role, $wpdb;
 
                 $usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
 
@@ -81 +80 @@
                 if ( isset( $_REQUEST['order'] ) )
                         $args['order'] = $_REQUEST['order'];
 
-                if ( ! empty( $_REQUEST['mode'] ) ) {
-                        $mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
-                        set_user_setting( 'network_users_list_mode', $mode );
-                } else {
-                        $mode = get_user_setting( 'network_users_list_mode', 'list' );
-                }
-
                 /** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */
                 $args = apply_filters( 'users_list_table_query_args', $args );
 
@@ -145 +137 @@
         }
 
         /**
-         * @global string $mode
-         * @param string $which
-         */
-        protected function pagination( $which ) {
-                global $mode;
-
-                parent::pagination ( $which );
-
-                if ( 'top' === $which ) {
-                        $this->view_switcher( $mode );
-                }
-        }
-
-        /**
          *
          * @return array
          */
@@ -278 +256 @@
          * @since 4.3.0
          * @access public
          *
-         * @global string $mode
-         *
          * @param WP_User $user The current WP_User object.
          */
         public function column_registered( $user ) {
-                global $mode;
-                if ( 'list' === $mode ) {
-                        $date = __( 'Y/m/d' );
-                } else {
                         $date = __( 'Y/m/d g:i:s a' );
-                }
                 echo mysql2date( $date, $user->user_registered );
         }