Changeset 52175
- Timestamp:
- 11/16/2021 02:13:25 AM (3 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/comment-template.php
r52154 r52175 2539 2539 comment_form_title( $args['title_reply'], $args['title_reply_to'] ); 2540 2540 2541 echo $args['cancel_reply_before']; 2542 2543 cancel_comment_reply_link( $args['cancel_reply_link'] ); 2544 2545 echo $args['cancel_reply_after']; 2541 if ( get_option( 'thread_comments' ) ) { 2542 echo $args['cancel_reply_before']; 2543 2544 cancel_comment_reply_link( $args['cancel_reply_link'] ); 2545 2546 echo $args['cancel_reply_after']; 2547 } 2546 2548 2547 2549 echo $args['title_reply_after']; -
trunk/tests/phpunit/tests/comment/commentForm.php
r51565 r52175 2 2 3 3 /** 4 * @group comment 4 * @group comment 5 * @covers ::comment_form 5 6 */ 6 7 class Tests_Comment_CommentForm extends WP_UnitTestCase { 8 public static $post_id; 9 10 public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) { 11 self::$post_id = $factory->post->create(); 12 } 13 7 14 public function test_default_markup_for_submit_button_and_wrapper() { 8 15 $p = self::factory()->post->create(); … … 124 131 $this->assertStringNotContainsString( 'aria-describedby="email-notes"', $form_without_aria ); 125 132 } 133 134 /** 135 * @ticket 32767 136 */ 137 public function test_when_thread_comments_enabled() { 138 update_option( 'thread_comments', true ); 139 140 $form = get_echo( 'comment_form', array( array(), self::$post_id ) ); 141 $expected = '<a rel="nofollow" id="cancel-comment-reply-link" href="#respond" style="display:none;">Cancel reply</a>'; 142 $this->assertStringContainsString( $expected, $form ); 143 } 144 145 /** 146 * @ticket 32767 147 */ 148 public function test_when_thread_comments_disabled() { 149 delete_option( 'thread_comments' ); 150 151 $form = get_echo( 'comment_form', array( array(), self::$post_id ) ); 152 $expected = '<a rel="nofollow" id="cancel-comment-reply-link" href="#respond" style="display:none;">Cancel reply</a>'; 153 $this->assertStringNotContainsString( $expected, $form ); 154 } 126 155 }
Note: See TracChangeset
for help on using the changeset viewer.