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

Timestamp:

12/14/2018 02:32:33 AM (6 years ago)

Author:

pento

Message:

Default Themes: Import Twenty Nineteen from the 5.0 branch.

Merges [43808,43821,43842,43860,43892,43904,43909,43926-43929,43956,43961-43963] from the 5.0 branch to trunk.

Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, jorbin, netweb, b-07, khleomix, audrasjb, nielslange, mmaumio, richsalvucci, littlebigthing, dimadin, joyously, anevins, peterwilsoncc, dannycooper, iCaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, grapplerulrich, ocean90, joshfeck, frankew, AbdulWahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, nao, mayukojpn, enodekciw, ketuchetan, atanasangelovdev, poena, sharaz, artisticasad, mukesh27, burhandodhy, crunnells, aprakasa, themeroots, imonly_ik, tlxo, youthkee, brentswisher, smyoon315, mrahmadawais, desideveloper, Kau-Boy, mor10, mikeyarce, dingo_bastard, xkon, twoabove.

Fixes #45424.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-content/themes/twentynineteen (copied) (copied from branches/5.0/src/wp-content/themes/twentynineteen)
• src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php (modified) (5 diffs)

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

@@ -5 +5 @@
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
@@ -35 +36 @@
                             $comment_author_link = get_comment_author_link( $comment );
                             $comment_author_url  = get_comment_author_url( $comment );
+                            $comment_author      = get_comment_author( $comment );
                             $avatar              = get_avatar( $comment, $args['avatar_size'] );
                             if ( 0 != $args['avatar_size'] ) {
@@ -40 +42 @@
                                     echo $avatar;
                                 } else {
-                                    echo preg_replace( '/>[^<]+</', sprintf( '>%s<', $avatar ), $comment_author_link );
+                                    printf( '<a href="%s" rel="external nofollow" class="url">', $comment_author_url );
+                                    echo $avatar;
                                 }
                             }
@@ -53 +56 @@
                             }
 
-                            /* translators: %s: comment author link */
                             printf(
-                                __( '%s <span class="screen-reader-text says">says:</span>' ),
-                                sprintf( '<b class="fn">%s</b>', get_comment_author_link( $comment ) )
+                                /* translators: %s: comment author link */
+                                __( '%s <span class="screen-reader-text says">says:</span>', 'twentynineteen' ),
+                                sprintf( '<span class="fn">%s</span>', $comment_author )
                             );
+
+                            if ( ! empty( $comment_author_url ) ) {
+                                echo '</a>';
+                            }
                         ?>
                     </div><!-- .comment-author -->
@@ -63 +70 @@
                     <div class="comment-metadata">
                         <a href="<?php echo esc_url( get_comment_link( $comment, $args ) ); ?>">
-                            <?php /* translators: 1: comment date, 2: comment time */ ?>
-                            <time datetime="<?php comment_time( 'c' ); ?>" title="<?php printf( __( '%1$s at %2$s', 'twentynineteen' ), get_comment_date( '', $comment ), get_comment_time() ); ?>">
-                                <?php printf( __( '%1$s at %2$s', 'twentynineteen' ), get_comment_date( '', $comment ), get_comment_time() ); ?>
+                            <?php
+                                /* translators: 1: comment date, 2: comment time */
+                                $comment_timestamp = sprintf( __( '%1$s at %2$s', 'twentynineteen' ), get_comment_date( '', $comment ), get_comment_time() );
+                            ?>
+                            <time datetime="<?php comment_time( 'c' ); ?>" title="<?php echo $comment_timestamp; ?>">
+                                <?php echo $comment_timestamp; ?>
                             </time>
                         </a>
                         <?php
                             $edit_comment_icon = twentynineteen_get_icon_svg( 'edit', 16 );
-                            edit_comment_link( __( 'Edit' ), '<span class="edit-link-sep">&mdash;</span> <span class="edit-link">' . $edit_comment_icon, '</span>' );
+                            edit_comment_link( __( 'Edit', 'twentynineteen' ), '<span class="edit-link-sep">&mdash;</span> <span class="edit-link">' . $edit_comment_icon, '</span>' );
                         ?>
                     </div><!-- .comment-metadata -->
 
                     <?php if ( '0' == $comment->comment_approved ) : ?>
-                    <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></p>
+                    <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentynineteen' ); ?></p>
                     <?php endif; ?>
                 </footer><!-- .comment-meta -->