Changeset 44681 for trunk/src/wp-includes/class-walker-comment.php

Timestamp:

01/21/2019 10:45:51 PM (6 years ago)

Author:

pento

Message:

Comments: 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 azaozz, pento.
Fixes #44736.

File:

• trunk/src/wp-includes/class-walker-comment.php (modified) (4 diffs)

trunk/src/wp-includes/class-walker-comment.php

@@ -264 +264 @@
             $add_below = 'div-comment';
         }
+
+        $commenter = wp_get_current_commenter();
+        if ( $commenter['comment_author_email'] ) {
+            $moderation_note = __( 'Your comment is awaiting moderation.' );
+        } else {
+            $moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.' );
+        }
+
         ?>
         <<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?> id="comment-<?php comment_ID(); ?>">
@@ -283 +291 @@
         </div>
         <?php if ( '0' == $comment->comment_approved ) : ?>
-        <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></em>
+        <em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
         <br />
         <?php endif; ?>
@@ -346 +354 @@
     protected function html5_comment( $comment, $depth, $args ) {
         $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
+
+        $commenter = wp_get_current_commenter();
+        if ( $commenter['comment_author_email'] ) {
+            $moderation_note = __( 'Your comment is awaiting moderation.' );
+        } else {
+            $moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.' );
+        }
+
         ?>
         <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>
@@ -377 +393 @@
 
                     <?php if ( '0' == $comment->comment_approved ) : ?>
-                    <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></p>
+                    <em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
                     <?php endif; ?>
                 </footer><!-- .comment-meta -->