Skip to content

Comments: Show previous commenter name if display name changes #9138

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
SainathPoojary wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Comments: Show previous commenter name if display name changes #9138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cad8a0
Comments: Show previous commenter name if display name changes
SainathPoojary Jun 30, 2025
bba5b27
Comments: Add tests for comment author display with different user names
SainathPoojary Jul 1, 2025
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
51 changes: 37 additions & 14 deletions src/wp-includes/comment-template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,25 @@
* Default current comment.
* @return string The comment author
*/
function get_comment_author( $comment_id = 0 ) {
/**
* Retrieves the author of the current comment.
*
* If the comment has an empty comment_author field, then 'Anonymous' person is
* assumed.
* If the commenter name has changed, both the new one and the old one are shown.
*
* @since 1.5.0
* @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
* @since 5.0.0 Added `$before_alias` and `$after_alias` parameters to customize former commenter name.
*
* @param int|WP_Comment $comment_id Optional. WP_Comment or the ID of the comment for which to retrieve the author.
* Default current comment.
* @param string $before_alias The custom text before the former author name.
* @param string $after_alias The custom text after the former author name.
* @return string The comment author
*/
function get_comment_author( $comment_id = 0, $before_alias = null, $after_alias = null ) {
$comment = get_comment( $comment_id );

if ( ! empty( $comment->comment_ID ) ) {
$comment_id = $comment->comment_ID;
} elseif ( is_scalar( $comment_id ) ) {
Expand All @@ -32,15 +48,22 @@ function get_comment_author( $comment_id = 0 ) {
$comment_id = '0';
}

if ( empty( $comment->comment_author ) ) {
$user = ! empty( $comment->user_id ) ? get_userdata( $comment->user_id ) : false;
if ( $user ) {
$comment_author = $user->display_name;
} else {
$comment_author = __( 'Anonymous' );
$author = __( 'Anonymous' );
$user = ! empty( $comment->user_id ) ? get_userdata( $comment->user_id ) : false;

if ( ! empty( $comment->comment_author ) ) {
$author = $comment->comment_author;
if ( $user && $author !== $user->display_name ) {
if ( is_null( $before_alias ) ) {
$before_alias = __( ' (Initially posted by ' );
}
if ( is_null( $after_alias ) ) {
$after_alias = __( ')' );
}
$author = $user->display_name . $before_alias . $author . $after_alias;
}
} else {
$comment_author = $comment->comment_author;
} elseif ( $user ) {
$author = $user->display_name;
}

/**
Expand All @@ -49,11 +72,11 @@ function get_comment_author( $comment_id = 0 ) {
* @since 1.5.0
* @since 4.1.0 The `$comment_id` and `$comment` parameters were added.
*
* @param string $comment_author The comment author's username.
* @param string $comment_id The comment ID as a numeric string.
* @param WP_Comment $comment The comment object.
* @param string $author The comment author's username.
* @param string $comment_id The comment ID as a numeric string.
* @param WP_Comment $comment The comment object.
*/
return apply_filters( 'get_comment_author', $comment_author, $comment_id, $comment );
return apply_filters( 'get_comment_author', $author, $comment_id, $comment );
}

/**
Expand Down
33 changes: 33 additions & 0 deletions tests/phpunit/tests/comment/getCommentAuthor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,37 @@
),
);
}

/**
* @ticket 10653
*/
public function test_comment_author_with_name_different_from_user_name() {
$user_id = self::factory()->user->create(
array(
'display_name' => 'Commenter Name',
)
);
$comment = self::factory()->comment->create_and_get(
array(
'user_id' => $user_id,

Check warning on line 127 in tests/phpunit/tests/comment/getCommentAuthor.php

View workflow job for this annotation

GitHub Actions / PHP coding standards / Run coding standards checks 

Array double arrow not aligned correctly; expected 8 space(s) between "'user_id'" and double arrow, but found 1.
'comment_author' => 'Old Commenter Name',
)
);
$this->assertEquals( 'Commenter Name (Initially posted by Old Commenter Name)', get_comment_author( $comment ) );
}

public function test_comment_author_with_name_different_from_user_name_with_custom_before_after() {
$user_id = self::factory()->user->create(
array(
'display_name' => 'Commenter Name',
)
);
$comment = self::factory()->comment->create_and_get(
array(
'user_id' => $user_id,

Check warning on line 142 in tests/phpunit/tests/comment/getCommentAuthor.php

View workflow job for this annotation

GitHub Actions / PHP coding standards / Run coding standards checks 

Array double arrow not aligned correctly; expected 8 space(s) between "'user_id'" and double arrow, but found 1.
'comment_author' => 'Old Commenter Name',
)
);
$this->assertEquals( 'Commenter Name AKA Old Commenter Name', get_comment_author( $comment, ' AKA ', '' ) );
}
}
Loading