Changeset 44199 for branches/5.0/src/wp-content/themes/twentynineteen/comments.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/comments.php (modified) (1 diff)

branches/5.0/src/wp-content/themes/twentynineteen/comments.php

@@ -29 +29 @@
                 <h2 class="comments-title">
                 <?php
-                        if ( comments_open() ) {
-                                if ( have_comments() ) {
-                                        _e( 'Join the Conversation', 'twentynineteen' );
-                                } else {
-                                        _e( 'Leave a comment', 'twentynineteen' );
-                                }
+                if ( comments_open() ) {
+                        if ( have_comments() ) {
+                                _e( 'Join the Conversation', 'twentynineteen' );
                         } else {
-                                if ( '1' == $discussion->responses ) {
-                                        /* translators: %s: post title */
-                                        printf( _x( 'One reply on &ldquo;%s&rdquo;', 'comments title', 'twentynineteen' ), get_the_title() );
-                                } else {
-                                        printf(
-                                                /* translators: 1: number of comments, 2: post title */
-                                                _nx(
-                                                        '%1$s reply on &ldquo;%2$s&rdquo;',
-                                                        '%1$s replies on &ldquo;%2$s&rdquo;',
-                                                        $discussion->responses,
-                                                        'comments title',
-                                                        'twentynineteen'
-                                                ),
-                                                number_format_i18n( $discussion->responses ),
-                                                get_the_title()
-                                        );
-                                }
+                                _e( 'Leave a comment', 'twentynineteen' );
                         }
+                } else {
+                        if ( '1' == $discussion->responses ) {
+                                /* translators: %s: post title */
+                                printf( _x( 'One reply on &ldquo;%s&rdquo;', 'comments title', 'twentynineteen' ), get_the_title() );
+                        } else {
+                                printf(
+                                        /* translators: 1: number of comments, 2: post title */
+                                        _nx(
+                                                '%1$s reply on &ldquo;%2$s&rdquo;',
+                                                '%1$s replies on &ldquo;%2$s&rdquo;',
+                                                $discussion->responses,
+                                                'comments title',
+                                                'twentynineteen'
+                                        ),
+                                        number_format_i18n( $discussion->responses ),
+                                        get_the_title()
+                                );
+                        }
+                }
                 ?>
                 </h2><!-- .comments-title -->
                 <?php
                         // Only show discussion meta information when comments are open and available.
-                        if ( have_comments() && comments_open() ) {
+                if ( have_comments() && comments_open() ) {
                         get_template_part( 'template-parts/post/discussion', 'meta' );
-                        }
+                }
                 ?>
         </div><!-- .comments-title-flex -->