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

Timestamp:

12/18/2018 10:45: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.

• Fix the gallery caption link color. ​https://github.com/WordPress/twentynineteen/pull/687
• Remove left padding from pullquote blocks. ​https://github.com/WordPress/twentynineteen/pull/690
• Print skip-link-focus-fix inline instead of enqueueing as blocking script. ​https://github

.com/WordPress/twentynineteen/pull/47

• Fix and improve some strings with placeholders. ​https://github.com/WordPress/twentynineteen/pull/217
• 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
• Fix left/right-aligned pullquote spacing. ​https://github.com/WordPress/twentynineteen/pull/695
• Improve readme.txt to follow the correct standards for themes. ​https://github.com/WordPress/twentynineteen/issues/689

Props kjellr, allancole, dimadin, westonruter, khleomix, grapplerulrich, iCaleb, desrosj.

Merges [44196], [44199], and [44201-44202] into trunk.

Fixes #45424.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php (modified) (3 diffs)

trunk/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'] );
+                                                $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 ) ) {
@@ -46 +46 @@
                                                         }
                                                 }
-
-                                                        /*
-                                                         * 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.
-                                                         */
+                                                /*
+                                                 * 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 ) ) {
-                                                        /* translators: %s: SVG Icon */
                                                         printf( '<span class="post-author-badge" aria-hidden="true">%s</span>', twentynineteen_get_icon_svg( 'check', 24 ) );
                                                 }
 
-                                                        printf(
-                                                                /* translators: %s: comment author link */
+                                                /*
+                                                 * 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' ),
-                                                                sprintf( '<span class="fn">%s</span>', $comment_author )
-                                                        );
+                                                                array(
+                                                                        'span' => array(
+                                                                                'class' => array(),
+                                                                        ),
+                                                                )
+                                                        ),
+                                                        '<b class="fn">' . get_comment_author_link( $comment ) . '</b>'
+                                                );
 
                                                 if ( ! empty( $comment_author_url ) ) {
@@ -111 +124 @@
                 <?php
         }
-
 }