Changeset 44199 for branches/5.0/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php

Timestamp:

12/14/2018 09:50:16 PM (8 years ago)

Author:

desrosj

Message:

Twenty Nineteen: Fixes and improvements.

This commit brings over several changes that occurred upstream in the theme’s GitHub repository into core.

• Fixes some minor code quality issues. ​https://github.com/WordPress/twentynineteen/pull/237
• Fix PHP Warning: Parameter must be an array or an object that implements Countable. ​https://github.com/WordPress/twentynineteen/pull/661
• Add missing text domain and escaping to comment author text. ​https://github.com/WordPress/twentynineteen/pull/274
• Remove hyphens rule for cover image text. ​https://github.com/WordPress/twentynineteen/pull/691

Props khleomix, grapplerulrich, iCaleb, kjellr, allancole.

See #45424.

File:

• branches/5.0/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php (modified) (1 diff)

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

@@ -34 +34 @@
                                         <div class="comment-author vcard">
                                                 <?php
-                                                        $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'] ) {
-                                                                if ( empty( $comment_author_url ) ) {
-                                                                        echo $avatar;
-                                                                } else {
-                                                                        printf( '<a href="%s" rel="external nofollow" class="url">', $comment_author_url );
-                                                                        echo $avatar;
-                                                                }
+                                                $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'] ) {
+                                                        if ( empty( $comment_author_url ) ) {
+                                                                echo $avatar;
+                                                        } else {
+                                                                printf( '<a href="%s" rel="external nofollow" class="url">', $comment_author_url );
+                                                                echo $avatar;
                                                         }
+                                                }
+                                                /*
+                                                 * Using the `check` icon instead of `check_circle`, since we can't add a
+                                                 * fill color to the inner check shape when in circle form.
+                                                 */
+                                                if ( twentynineteen_is_comment_by_post_author( $comment ) ) {
+                                                        printf( '<span class="post-author-badge" aria-hidden="true">%s</span>', twentynineteen_get_icon_svg( 'check', 24 ) );
+                                                }
 
-                                                        /*
-                                                         * Using the `check` icon instead of `check_circle`, since we can't add a
-                                                         * fill color to the inner check shape when in circle form.
-                                                         */
-                                                        if ( twentynineteen_is_comment_by_post_author( $comment ) ) {
-                                                                printf( '<span class="post-author-badge" aria-hidden="true">%s</span>', twentynineteen_get_icon_svg( 'check', 24 ) );
-                                                        }
+                                                printf(
+                                                        /* translators: %s: comment author link */
+                                                        wp_kses(
+                                                                __( '%s <span class="screen-reader-text says">says:</span>', 'twentynineteen' ),
+                                                                array(
+                                                                        'span' => array(
+                                                                                'class' => array(),
+                                                                        ),
+                                                                )
+                                                        ),
+                                                        '<b class="fn">' . get_comment_author_link( $comment ) . '</b>'
+                                                );
 
-                                                        printf(
-                                                                /* 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>';
-                                                        }
+                                                if ( ! empty( $comment_author_url ) ) {
+                                                        echo '</a>';
+                                                }
                                                 ?>
                                         </div><!-- .comment-author -->