From 3e145711323ba541dccbea665edb604c877d5790 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Wed, 17 Feb 2016 22:00:27 +0000
Subject: [PATCH] Multisite: Make view mode sticky for network users and sites
 list tables.

Fixes #34365.

Built from https://develop.svn.wordpress.org/trunk@36562


git-svn-id: http://core.svn.wordpress.org/trunk@36529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-ms-sites-list-table.php | 7 ++++++-
 wp-admin/includes/class-wp-ms-users-list-table.php | 7 ++++++-
 wp-includes/version.php                            | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php
index 34436a7518..ff9736f40e 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -69,7 +69,12 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 
 		$current_site = get_current_site();
 
-		$mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
+		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' );
+		}
 
 		$per_page = $this->get_items_per_page( 'sites_network_per_page' );
 
diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php
index e94081f4c8..4b8e8fc8eb 100644
--- a/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -81,7 +81,12 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		if ( isset( $_REQUEST['order'] ) )
 			$args['order'] = $_REQUEST['order'];
 
-		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+		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 );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ef85c356ce..9d9022ceb0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36561';
+$wp_version = '4.5-alpha-36562';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.