From e4b2ad02b6c92bd27ece7e26799466a6362d9126 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 28 Jul 2020 16:55:04 +0000
Subject: [PATCH] Administration: Don't override the `$mode` global in
 `WP_Screen::render_view_mode()` if it's already set.

Follow-up to [48398], [48423], [48424], [48450].

See #49715.
Built from https://develop.svn.wordpress.org/trunk@48670


git-svn-id: http://core.svn.wordpress.org/trunk@48432 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-comments-list-table.php | 5 ++++-
 wp-admin/includes/class-wp-screen.php              | 4 +++-
 wp-includes/version.php                            | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index c7ffb4d9f2..91b29c5c1f 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -78,17 +78,20 @@ class WP_Comments_List_Table extends WP_List_Table {
 	}
 
 	/**
+	 * @global string $mode           List table view mode.
 	 * @global int    $post_id
 	 * @global string $comment_status
 	 * @global string $comment_type
 	 * @global string $search
 	 */
 	public function prepare_items() {
-		global $post_id, $comment_status, $comment_type, $search;
+		global $mode, $post_id, $comment_status, $comment_type, $search;
 
 		if ( ! empty( $_REQUEST['mode'] ) ) {
 			$mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
 			set_user_setting( 'posts_list_mode', $mode );
+		} else {
+			$mode = get_user_setting( 'posts_list_mode', 'list' );
 		}
 
 		$comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
diff --git a/wp-admin/includes/class-wp-screen.php b/wp-admin/includes/class-wp-screen.php
index ce98c2c840..440527f249 100644
--- a/wp-admin/includes/class-wp-screen.php
+++ b/wp-admin/includes/class-wp-screen.php
@@ -1313,7 +1313,9 @@ final class WP_Screen {
 			return;
 		}
 
-		$mode = get_user_setting( 'posts_list_mode', 'list' );
+		if ( ! isset( $mode ) ) {
+			$mode = get_user_setting( 'posts_list_mode', 'list' );
+		}
 
 		// This needs a submit button.
 		add_filter( 'screen_options_show_submit', '__return_true' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index aa428ad11b..21c26f08c5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta4-48669';
+$wp_version = '5.5-beta4-48670';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.