From a918d853aabbd5ca894de7a4d6a97b61dae8f6e8 Mon Sep 17 00:00:00 2001
From: whyisjake <whyisjake@git.wordpress.org>
Date: Tue, 23 Jun 2020 05:56:08 +0000
Subject: [PATCH] Quick/Bulk Edit: Ensure the proper actions is triggered when
 using the bulk updater.

If a user selects the top option, then chooses a different option, the top selection takes precedence. This update gives a new name to the bottom action, ensuring the proper update is carried out.

Fixes 46872.

Props clayray, garrett-eclipse, subrataemfluence.


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


git-svn-id: http://core.svn.wordpress.org/trunk@47903 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-list-table.php | 10 +++++-----
 wp-includes/version.php                   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php
index fb65d66c94..3c7e6b3a3f 100644
--- a/wp-admin/includes/class-wp-list-table.php
+++ b/wp-admin/includes/class-wp-list-table.php
@@ -473,7 +473,7 @@ class WP_List_Table {
 
 		echo "</select>\n";
 
-		submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two" ) );
+		submit_button( __( 'Apply' ), 'action', "doaction$two", false, array( 'id' => "doaction$two" ) );
 		echo "\n";
 	}
 
@@ -489,12 +489,12 @@ class WP_List_Table {
 			return false;
 		}
 
-		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] ) {
-			return $_REQUEST['action'];
+		if ( isset( $_REQUEST['doaction2'] ) && isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
+			return $_REQUEST['action2'];
 		}
 
-		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
-			return $_REQUEST['action2'];
+		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] ) {
+			return $_REQUEST['action'];
 		}
 
 		return false;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e2846fa8b9..eae6330b85 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-48133';
+$wp_version = '5.5-alpha-48134';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.