Changeset 46357 for trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-comment.php

Timestamp:

09/30/2019 05:40:14 PM (5 years ago)

Author:

desrosj

Message:

Bundled Themes: Update Twenty Twenty.

This brings trunk’s version of Twenty Twenty in-sync with GitHub.

For a complete list of changes since [46271], see ​https://github.com/WordPress/twentytwenty/compare/932b16248...dd7032f

Props anlino, ianbelanger, nielslange, acosmin, netweb, williampatton, adhitya03, phpdocs, acalfieri, itowhid06, littlebigthing, aristath, karmatosed, poena.
See #48110.

File:

• trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-comment.php (modified) (4 diffs)

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

@@ -70 +70 @@
                                 </time>
                             </a>
+                            <?php
+                            if ( get_edit_comment_link() ) {
+                                echo ' &bull; <a class="comment-edit-link" href="' . esc_url( get_edit_comment_link() ) . '">' . __( 'Edit', 'twentytwenty' ) . '</a>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- core trusts translations
+                            }
+                            ?>
                         </div><!-- .comment-metadata -->
 
@@ -85 +90 @@
                             <?php
                         }
+
                         ?>
 
@@ -106 +112 @@
                     $by_post_author = twentytwenty_is_comment_by_post_author( $comment );
 
-                    $edit_comment_link = get_edit_comment_link() ? '<a class="edit-comment-link" href="' . esc_url( get_edit_comment_link() ) . '">' . __( 'Edit', 'twentytwenty' ) . '</a>' : '';
-
-                    if ( $comment_reply_link || $by_post_author || $edit_comment_link ) {
+                    if ( $comment_reply_link || $by_post_author ) {
                         ?>
 
@@ -116 +120 @@
                             if ( $comment_reply_link ) {
                                 echo $comment_reply_link; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped --Link is escaped in https://developer.wordpress.org/reference/functions/get_comment_reply_link/
-                            }
-                            if ( $edit_comment_link ) {
-                                echo $edit_comment_link; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped --Link escaped on line 109.
                             }
                             if ( $by_post_author ) {