Skip to content

Comments: Fix apostrophe in author name breaking comment_whitelist check #11586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sukhendu2002 wants to merge 4 commits into
base: trunk
Choose a base branch
from
+52 −3
Open

Comments: Fix apostrophe in author name breaking comment_whitelist check #11586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f6c43a
Comments: Fix apostrophe in author name breaking comment_whitelist check
Sukhendu2002 Apr 16, 2026
b0f5b44
Merge branch 'trunk' into fix/40319-apostrophe-comment-whitelist
Sukhendu2002 Apr 17, 2026
73981dc
Merge branch 'trunk' into fix/40319-apostrophe-comment-whitelist
Sukhendu2002 Apr 20, 2026
f1c7dfd
Fix Doc Block formatting
Sukhendu2002 Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/wp-includes/comment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ function check_comment( $author, $email, $url, $comment, $user_ip, $user_agent,
)
);
} else {
// expected_slashed ($author, $email)
$ok_to_comment = $wpdb->get_var(
$wpdb->prepare(
"SELECT comment_approved
Expand All @@ -150,8 +149,8 @@ function check_comment( $author, $email, $url, $comment, $user_ip, $user_agent,
AND comment_author_email = %s
AND comment_approved = '1'
LIMIT 1",
$author,
$email
wp_unslash( $author ),
wp_unslash( $email )
)
);
}
Expand Down
50 changes: 50 additions & 0 deletions tests/phpunit/tests/comment/wpAllowComment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,56 @@ public function test_allow_comment_if_comment_author_emails_differ() {
$this->assertSame( 1, $result );
}

/**
* @ticket 40319
*
* @covers ::check_comment
*/
Comment thread
Sukhendu2002 marked this conversation as resolved.
public function test_allow_comment_if_previously_approved_author_name_and_email_contain_apostrophe() {
update_option( 'comment_previously_approved', 1 );
add_filter( 'comment_flood_filter', '__return_false' );

$now = time();

// Insert an already-approved comment with apostrophe in name and email.
$approved_comment_id = wp_insert_comment(
array(
'comment_post_ID' => self::$post_id,
'comment_approved' => '1',
'comment_author' => "O'Brien",
'comment_author_email' => "o'brien@example.com",
'comment_author_url' => 'http://example.com',
'comment_content' => 'Test comment.',
'comment_parent' => 0,
'comment_author_IP' => '192.168.0.1',
'comment_date_gmt' => gmdate( 'Y-m-d H:i:s', $now - 60 ),
'comment_agent' => 'TestAgent/1.0',
'comment_type' => '',
)
);

$new_comment = array(
'comment_post_ID' => self::$post_id,
'comment_author' => wp_slash( "O'Brien" ),
'comment_author_email' => wp_slash( "o'brien@example.com" ),
'comment_author_url' => 'http://example.com',
'comment_content' => 'A new comment.',
'comment_parent' => 0,
'comment_author_IP' => '192.168.0.1',
'comment_date_gmt' => gmdate( 'Y-m-d H:i:s', $now ),
'comment_agent' => 'TestAgent/1.0',
'comment_type' => '',
);

$result = wp_allow_comment( $new_comment );

wp_delete_comment( $approved_comment_id, true );
update_option( 'comment_previously_approved', 0 );
remove_filter( 'comment_flood_filter', '__return_false' );

$this->assertSame( 1, $result, 'Comment from previously-approved author with apostrophe in name/email should be auto-approved.' );
}

public function test_die_as_duplicate_if_comment_author_name_and_emails_match() {
$this->expectException( 'WPDieException' );

Expand Down
Loading