Changeset 52175

Timestamp:

11/16/2021 02:13:25 AM (3 years ago)

Author:

hellofromTonya

Message:

Comments: Don't output "cancel comment reply link" if comments aren't threaded.

Though hidden via style="display:none;", if the comments aren't threaded, this commit doesn't output the cancel comment reply link (skips over that logic). Change in comment_form().

Adds tests.

Follow-up to [12810], [38959].

Props henrywright, jigneshnakrani, rachelbaker, desrosj, audrasjb, hellofromTonya.
Fixes #37267.

Location:

trunk

Files:

• src/wp-includes/comment-template.php (modified) (1 diff)
• tests/phpunit/tests/comment/commentForm.php (modified) (2 diffs)

trunk/src/wp-includes/comment-template.php

@@ -2539 +2539 @@
         comment_form_title( $args['title_reply'], $args['title_reply_to'] );
 
-        echo $args['cancel_reply_before'];
-
-        cancel_comment_reply_link( $args['cancel_reply_link'] );
-
-        echo $args['cancel_reply_after'];
+        if ( get_option( 'thread_comments' ) ) {
+            echo $args['cancel_reply_before'];
+
+            cancel_comment_reply_link( $args['cancel_reply_link'] );
+
+            echo $args['cancel_reply_after'];
+        }
 
         echo $args['title_reply_after'];

trunk/tests/phpunit/tests/comment/commentForm.php

@@ -2 +2 @@
 
 /**
- * @group comment
+ * @group  comment
+ * @covers ::comment_form
  */
 class Tests_Comment_CommentForm extends WP_UnitTestCase {
+    public static $post_id;
+
+    public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+        self::$post_id = $factory->post->create();
+    }
+
     public function test_default_markup_for_submit_button_and_wrapper() {
         $p = self::factory()->post->create();
@@ -124 +131 @@
         $this->assertStringNotContainsString( 'aria-describedby="email-notes"', $form_without_aria );
     }
+
+    /**
+     * @ticket 32767
+     */
+    public function test_when_thread_comments_enabled() {
+        update_option( 'thread_comments', true );
+
+        $form     = get_echo( 'comment_form', array( array(), self::$post_id ) );
+        $expected = '<a rel="nofollow" id="cancel-comment-reply-link" href="#respond" style="display:none;">Cancel reply</a>';
+        $this->assertStringContainsString( $expected, $form );
+    }
+
+    /**
+     * @ticket 32767
+     */
+    public function test_when_thread_comments_disabled() {
+        delete_option( 'thread_comments' );
+
+        $form     = get_echo( 'comment_form', array( array(), self::$post_id ) );
+        $expected = '<a rel="nofollow" id="cancel-comment-reply-link" href="#respond" style="display:none;">Cancel reply</a>';
+        $this->assertStringNotContainsString( $expected, $form );
+    }
 }