From 522a7a5d40f0810925c6e4d293f05b55b28173d0 Mon Sep 17 00:00:00 2001
From: antpb <antpb@git.wordpress.org>
Date: Thu, 12 Nov 2020 15:46:07 +0000
Subject: [PATCH] Media: Allow users to switch from media grid to list mode in
 media library.

Fixes issue where media modal would open when switching from grid to list mode.

Props mista-flo, mukesh27.

Fixes #51396.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49306 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/media-template.php | 4 ++--
 wp-includes/version.php        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php
index 42a6f79131..84952584ab 100644
--- a/wp-includes/media-template.php
+++ b/wp-includes/media-template.php
@@ -309,10 +309,10 @@ function wp_print_media_templates() {
 
 	<?php // Template for the view switchers, used for example in the Media Grid. ?>
 	<script type="text/html" id="tmpl-media-library-view-switcher">
-		<a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ); ?>" class="view-list">
+		<a href="<?php echo esc_url( add_query_arg( 'mode', 'list', admin_url( 'upload.php' ) ) ); ?>" class="view-list">
 			<span class="screen-reader-text"><?php _e( 'List view' ); ?></span>
 		</a>
-		<a href="<?php echo esc_url( add_query_arg( 'mode', 'grid', $_SERVER['REQUEST_URI'] ) ); ?>" class="view-grid current" aria-current="page">
+		<a href="<?php echo esc_url( add_query_arg( 'mode', 'grid', admin_url( 'upload.php' ) ) ); ?>" class="view-grid current" aria-current="page">
 			<span class="screen-reader-text"><?php _e( 'Grid view' ); ?></span>
 		</a>
 	</script>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7057d113d2..948bd4a064 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-beta3-49567';
+$wp_version = '5.6-beta3-49568';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.