From 8e29221da4a38eba30c25dbb0b12562eb4f634c7 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 14 Sep 2019 21:00:56 +0000
Subject: [PATCH] Bundled Themes: Update the message shown when a comment is
 awaiting moderation.

If the commenter doesn't have cookies set, they won't see the comment preview again. Showing an expanded message will help offset any confusion if they revisit the site later, and their comment is still in moderation, but they can't see it anymore.

Props birgire, superpoincare.
Fixes #47461. See #43857.
Built from https://develop.svn.wordpress.org/trunk@46117


git-svn-id: http://core.svn.wordpress.org/trunk@45929 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyeleven/functions.php     | 15 ++++++++++++---
 .../class-twentynineteen-walker-comment.php      | 12 +++++++++++-
 wp-content/themes/twentyten/functions.php        | 16 +++++++++++++---
 wp-content/themes/twentytwelve/functions.php     | 13 +++++++++++--
 wp-includes/version.php                          |  2 +-
 5 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/wp-content/themes/twentyeleven/functions.php b/wp-content/themes/twentyeleven/functions.php
index 2fbbe4d04a..540c806c78 100644
--- a/wp-content/themes/twentyeleven/functions.php
+++ b/wp-content/themes/twentyeleven/functions.php
@@ -743,10 +743,19 @@ if ( ! function_exists( 'twentyeleven_comment' ) ) :
 						<?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 					</div><!-- .comment-author .vcard -->
 
-					<?php if ( $comment->comment_approved == '0' ) : ?>
-					<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentyeleven' ); ?></em>
+					<?php
+					$commenter = wp_get_current_commenter();
+					if ( $commenter['comment_author_email'] ) {
+						$moderation_note = __( 'Your comment is awaiting moderation.', 'twentyeleven' );
+					} else {
+						$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.', 'twentyeleven' );
+					}
+					?>
+
+					<?php if ( '0' == $comment->comment_approved ) : ?>
+					<em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
 					<br />
-				<?php endif; ?>
+					<?php endif; ?>
 
 				</footer>
 
diff --git a/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php b/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php
index 18565e9388..cded91d0bf 100644
--- a/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php
+++ b/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php
@@ -88,9 +88,19 @@ class TwentyNineteen_Walker_Comment extends Walker_Comment {
 						?>
 					</div><!-- .comment-metadata -->
 
+					<?php
+					$commenter = wp_get_current_commenter();
+					if ( $commenter['comment_author_email'] ) {
+						$moderation_note = __( 'Your comment is awaiting moderation.', 'twentynineteen' );
+					} else {
+						$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.', 'twentynineteen' );
+					}
+					?>
+
 					<?php if ( '0' == $comment->comment_approved ) : ?>
-					<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentynineteen' ); ?></p>
+					<p class="comment-awaiting-moderation"><?php echo $moderation_note; ?></p>
 					<?php endif; ?>
+
 				</footer><!-- .comment-meta -->
 
 				<div class="comment-content">
diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index 1a378c0dd1..97f018d4ab 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -428,9 +428,19 @@ if ( ! function_exists( 'twentyten_comment' ) ) :
 				printf( __( '%s <span class="says">says:</span>', 'twentyten' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) );
 				?>
 			</div><!-- .comment-author .vcard -->
-				<?php if ( $comment->comment_approved == '0' ) : ?>
-				<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
-				<br />
+
+				<?php
+				$commenter = wp_get_current_commenter();
+				if ( $commenter['comment_author_email'] ) {
+					$moderation_note = __( 'Your comment is awaiting moderation.', 'twentyten' );
+				} else {
+					$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.', 'twentyten' );
+				}
+				?>
+
+				<?php if ( '0' == $comment->comment_approved ) : ?>
+			<em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
+			<br />
 			<?php endif; ?>
 
 			<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
index 65dbc9fdb2..04da105b06 100644
--- a/wp-content/themes/twentytwelve/functions.php
+++ b/wp-content/themes/twentytwelve/functions.php
@@ -446,9 +446,18 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 				?>
 				</header><!-- .comment-meta -->
 
+				<?php
+				$commenter = wp_get_current_commenter();
+				if ( $commenter['comment_author_email'] ) {
+					$moderation_note = __( 'Your comment is awaiting moderation.', 'twentytwelve' );
+				} else {
+					$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.', 'twentytwelve' );
+				}
+				?>
+
 				<?php if ( '0' == $comment->comment_approved ) : ?>
-				<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentytwelve' ); ?></p>
-			<?php endif; ?>
+				<p class="comment-awaiting-moderation"><?php echo $moderation_note; ?></p>
+				<?php endif; ?>
 
 				<section class="comment-content comment">
 				<?php comment_text(); ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b402db20c9..8be83712fe 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-46116';
+$wp_version = '5.3-alpha-46117';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.