From 4a2943d45219028ce0e8bcdee0c26ccb2d664a6a Mon Sep 17 00:00:00 2001
From: roykho <roykho77@gmail.com>
Date: Fri, 4 Dec 2020 13:17:24 -0800
Subject: [PATCH] Defer nonce creation until displayed by WC Admin closes
 #27424

---
 .../notes/class-wc-notes-run-db-update.php    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/includes/admin/notes/class-wc-notes-run-db-update.php b/includes/admin/notes/class-wc-notes-run-db-update.php
index c723d231d06..f59074679d5 100644
--- a/includes/admin/notes/class-wc-notes-run-db-update.php
+++ b/includes/admin/notes/class-wc-notes-run-db-update.php
@@ -110,10 +110,13 @@ class WC_Notes_Run_Db_Update {
 	 */
 	private static function update_needed_notice( $note_id = null ) {
 		$update_url = html_entity_decode(
-			wp_nonce_url(
-				add_query_arg( 'do_update_woocommerce', 'true', wc_get_current_admin_url() ? wc_get_current_admin_url() : admin_url( 'admin.php?page=wc-settings' ) ),
-				'wc_db_update',
-				'wc_db_update_nonce'
+			add_query_arg(
+				array(
+					'do_update_woocommerce' => 'true',
+					'_nonce_action'         => 'wc_db_update',
+					'_nonce_name'           => 'wc_db_update_nonce',
+				),
+				wc_get_current_admin_url() ? wc_get_current_admin_url() : admin_url( 'admin.php?page=wc-settings' )
 			)
 		);
 
@@ -206,14 +209,13 @@ class WC_Notes_Run_Db_Update {
 	 */
 	private static function update_done_notice( $note_id ) {
 		$hide_notices_url = html_entity_decode( // to convert &amp;s to normal &, otherwise produces invalid link.
-			wp_nonce_url(
-				add_query_arg(
-					'wc-hide-notice',
-					'update',
-					wc_get_current_admin_url() ? wc_get_current_admin_url() : admin_url( 'admin.php?page=wc-settings' )
+			add_query_arg(
+				array(
+					'wc-hide-notice' => 'update',
+					'_nonce_action'  => 'woocommerce_hide_notices_nonce',
+					'_nonce_name'    => '_wc_notice_nonce',
 				),
-				'woocommerce_hide_notices_nonce',
-				'_wc_notice_nonce'
+				wc_get_current_admin_url() ? wc_get_current_admin_url() : admin_url( 'admin.php?page=wc-settings' )
 			)
 		);