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

Timestamp:

10/30/2018 02:13:07 AM (6 years ago)

Author:

allancole

Message:

Importing Twenty Nineteen, our new default theme for 2019, set for 5.0.

Let Gutenberg shine with this simple, fast, and powerful theme. Initial development occurred on GitHub. See: ​https://github.com/WordPress/twentynineteen

Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, aaronjorbin, netweb, b-07, khleomix, blowery, dereksmart, jasmussen, audrasjb, nielslange, mmaumio, dimadin, joyously, anevins12, peterwilsoncc, dannycooper, icaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, icaleb, grapplerulrich, ocean90, joshfeck, frankew, abdulwahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart.

File:

• branches/5.0/src/wp-content/themes/twentynineteen/comments.php (modified) (4 diffs)

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

@@ -10 +10 @@
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
@@ -29 +30 @@
             if ( comments_open() ) {
                 if ( have_comments() ) {
-                    echo esc_html_e( 'Join the Conversation', 'twentynineteen' );
+                    esc_html_e( 'Join the Conversation', 'twentynineteen' );
                 } else {
-                    echo esc_html_e( 'Leave a comment', 'twentynineteen' );
+                    esc_html_e( 'Leave a comment', 'twentynineteen' );
                 }
             } else {
@@ -85 +86 @@
         <?php
 
-        // Show comment form at bottom if showing newest comments at the bottom.
-        if ( comments_open() && 'asc' === strtolower( get_option( 'comment_order', 'asc' ) ) ) :
-            ?>
-            <div class="comment-form-flex">
-                <span class="screen-reader-text"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></span>
-                <?php twentynineteen_comment_form( 'asc' ); ?>
-                <h2 class="comments-title" aria-hidden="true"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></h2>
-            </div>
-            <?php
-        endif;
-
         // Show comment navigation
         if ( have_comments() ) :
@@ -107 +97 @@
                 )
             );
+        endif;
+
+        // Show comment form at bottom if showing newest comments at the bottom.
+        if ( comments_open() && 'asc' === strtolower( get_option( 'comment_order', 'asc' ) ) ) :
+            ?>
+            <div class="comment-form-flex">
+                <span class="screen-reader-text"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></span>
+                <?php twentynineteen_comment_form( 'asc' ); ?>
+                <h2 class="comments-title" aria-hidden="true"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></h2>
+            </div>
+            <?php
         endif;