From aad1fa48ea68b05329eec92e1cca8b178b1641f7 Mon Sep 17 00:00:00 2001
From: whyisjake <whyisjake@git.wordpress.org>
Date: Tue, 7 Jul 2020 03:59:02 +0000
Subject: [PATCH] Site Health: Ensure that the user will be notified after a
 successful snooze action.

After clicking remind me later, the user is shown an admin notification.

Fixes #48333.

Props desrosj, sathyapulse, Clorith, azaozz, audrasjb, afragen, whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/index.php        | 29 +++++++++++++++++++++++++++++
 wp-includes/functions.php |  1 +
 wp-includes/version.php   |  2 +-
 wp-login.php              |  1 +
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/wp-admin/index.php b/wp-admin/index.php
index 3b3519b1a2..251da847a4 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -114,6 +114,35 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 <div class="wrap">
 	<h1><?php echo esc_html( $title ); ?></h1>
 
+	<?php
+	if ( ! empty( $_GET['admin_email_remind_later'] ) ) :
+		/** This filter is documented in wp-login.php */
+		$remind_interval = (int) apply_filters( 'admin_email_remind_interval', 3 * DAY_IN_SECONDS );
+		$postponed_time  = get_option( 'admin_email_lifespan' );
+
+		/*
+		 * Calculate how many seconds it's been since the reminder was postponed.
+		 * This allows us to not show it if the query arg is set, but visited due to caches, bookmarks or similar.
+		 */
+		$time_passed = $postponed_time - $remind_interval - time();
+
+		// Only show the dashboard notice if it's been less than a minute since the message was postponed.
+		if ( $time_passed > -60 ) :
+			?>
+		<div class="notice notice-success is-dismissible">
+			<p>
+				<?php
+				printf(
+					/* translators: %1$s: The number of comments. %2$s: The post title. */
+					_n( 'The admin email verification page will reappear after %d day.', 'The admin email verification page will reappear after %d days.', 3 ),
+					number_format_i18n( 3 )
+				);
+				?>
+			</p>
+		</div>
+		<?php endif; ?>
+	<?php endif; ?>
+
 <?php
 if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
 	$classes = 'welcome-panel';
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 31f4bee377..f7ee143c57 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1181,6 +1181,7 @@ function wp_removable_query_args() {
 	$removable_query_args = array(
 		'activate',
 		'activated',
+		'admin_email_remind_later',
 		'approved',
 		'deactivate',
 		'delete_count',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5d89bd7cb2..d8bae88751 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-48358';
+$wp_version = '5.5-alpha-48359';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-login.php b/wp-login.php
index 590711cac7..320ea909b5 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -617,6 +617,7 @@ switch ( $action ) {
 				update_option( 'admin_email_lifespan', time() + $remind_interval );
 			}
 
+			$redirect_to = add_query_arg( 'admin_email_remind_later', 1, $redirect_to );
 			wp_safe_redirect( $redirect_to );
 			exit;
 		}