Changeset 46117

Timestamp:

09/14/2019 08:59:29 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk/src/wp-content/themes

Files:

• twentyeleven/functions.php (modified) (1 diff)
• twentynineteen/classes/class-twentynineteen-walker-comment.php (modified) (1 diff)
• twentyten/functions.php (modified) (1 diff)
• twentytwelve/functions.php (modified) (1 diff)

trunk/src/wp-content/themes/twentyeleven/functions.php

@@ -744 +744 @@
                     </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>

trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php

@@ -89 +89 @@
                     </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 -->
 

trunk/src/wp-content/themes/twentyten/functions.php

@@ -429 +429 @@
                 ?>
             </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; ?>
 

trunk/src/wp-content/themes/twentytwelve/functions.php

@@ -447 +447 @@
                 </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">