Ticket #16774: 16777.expanded.diff

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

@@ -22 +22 @@
         function prepare_items() {
                 global $s, $mode, $wpdb, $current_site;
 
-                $mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
+                $mode = self::get_mode( 'list' );
 
                 $per_page = $this->get_items_per_page( 'sites_network_per_page' );
 

wp-admin/includes/class-wp-posts-list-table.php

@@ -96 +96 @@
                 else
                         $total_pages = $wp_query->max_num_pages;
 
-                $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+                $mode = self::get_mode( 'list' );
 
                 $this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] == 'trash';
 

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

@@ -915 +915 @@
 
                 printf( "<script type='text/javascript'>list_args = %s;</script>\n", json_encode( $args ) );
         }
+
+        /**
+         * Get the mode.  Carry over the user's preference from last time.
+         *
+         * @since 3.5
+         * @return string
+         */
+        function get_mode( $fallback = 'list' ){
+                $screen = get_current_screen();
+
+                $default_mode = get_user_option( "{$screen->id}_last_view" );
+                if ( empty( $default_mode ) )
+                        $default_mode = $fallback;
+
+                $mode = ( ! empty( $_REQUEST['mode'] ) ) ? $_REQUEST['mode'] : $default_mode;
+
+                if ( $mode !== $default_mode )
+                        update_user_meta( get_current_user_id(), "{$screen->id}_last_view", $mode );
+                
+                return $mode;
+        }
 }

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

@@ -56 +56 @@
                 if ( isset( $_REQUEST['order'] ) )
                         $args['order'] = $_REQUEST['order'];
 
-                $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+                $mode = self::get_mode( 'list' );
 
                 // Query the user IDs for this page
                 $wp_user_search = new WP_User_Query( $args );