From 219079f7a301ed66c83490fa0ef2ac75544be92b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= <helen.y.hou@gmail.com>
Date: Tue, 27 Oct 2020 18:19:06 +0000
Subject: [PATCH] Privacy: Show failures before successes for all bulk actions.

Props garrett-eclipse.
See #44081, [49331].

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


git-svn-id: http://core.svn.wordpress.org/trunk@49094 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../class-wp-privacy-requests-table.php       | 34 +++++++++----------
 wp-includes/version.php                       |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/wp-admin/includes/class-wp-privacy-requests-table.php b/wp-admin/includes/class-wp-privacy-requests-table.php
index 2fdfc9342c..bb1d445da7 100644
--- a/wp-admin/includes/class-wp-privacy-requests-table.php
+++ b/wp-admin/includes/class-wp-privacy-requests-table.php
@@ -247,23 +247,6 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table {
 					}
 				}
 
-				if ( $count ) {
-					add_settings_error(
-						'bulk_action',
-						'bulk_action',
-						sprintf(
-							/* translators: %d: Number of requests. */
-							_n(
-								'%d confirmation request re-sent successfully.',
-								'%d confirmation requests re-sent successfully.',
-								$count
-							),
-							$count
-						),
-						'success'
-					);
-				}
-
 				if ( $failures ) {
 					add_settings_error(
 						'bulk_action',
@@ -281,6 +264,23 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table {
 					);
 				}
 
+				if ( $count ) {
+					add_settings_error(
+						'bulk_action',
+						'bulk_action',
+						sprintf(
+							/* translators: %d: Number of requests. */
+							_n(
+								'%d confirmation request re-sent successfully.',
+								'%d confirmation requests re-sent successfully.',
+								$count
+							),
+							$count
+						),
+						'success'
+					);
+				}
+
 				break;
 
 			case 'complete':
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e746976120..e0b1af5164 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-beta1-49331';
+$wp_version = '5.6-beta1-49333';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.