From 786e930a57c0bffb28abb4c73f1c2699aa4fa5e9 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Thu, 13 Feb 2025 13:10:53 +1000 Subject: [PATCH 1/2] Comments Connector: Avoid a PHP Warning on pingbacks. --- connectors/class-connector-comments.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/connectors/class-connector-comments.php b/connectors/class-connector-comments.php index 5e67b2405..8f28d19bd 100644 --- a/connectors/class-connector-comments.php +++ b/connectors/class-connector-comments.php @@ -194,10 +194,10 @@ public function get_comment_author( $comment, $field = 'id' ) { $user_name = isset( $user->display_name ) ? $user->display_name : $comment->comment_author; } - if ( $req_user_login && isset( $comment->user_id ) ) { + if ( $req_user_login && ! empty( $comment->user_id ) ) { $user = get_user_by( 'id', $comment->user_id ); - $user_id = $user->ID; - $user_name = $user->display_name; + $user_id = isset( $user->ID ) ? $user->ID : 0; + $user_name = isset( $user->display_name ) ? $user->display_name : $comment->comment_author; } if ( 'id' === $field ) { From 413bb30ffb2cae719f568e3bc513180102635d01 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Wed, 26 Mar 2025 13:18:46 +1000 Subject: [PATCH 2/2] Respect the comment_author_email user details if set In some cases `require_name_email` and `comment_registration` will both be enabled, the details from the email lookup should be respected before falling back to the comment author name. --- connectors/class-connector-comments.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/connectors/class-connector-comments.php b/connectors/class-connector-comments.php index 8f28d19bd..c22fb03d7 100644 --- a/connectors/class-connector-comments.php +++ b/connectors/class-connector-comments.php @@ -195,9 +195,11 @@ public function get_comment_author( $comment, $field = 'id' ) { } if ( $req_user_login && ! empty( $comment->user_id ) ) { - $user = get_user_by( 'id', $comment->user_id ); - $user_id = isset( $user->ID ) ? $user->ID : 0; - $user_name = isset( $user->display_name ) ? $user->display_name : $comment->comment_author; + $user = get_user_by( 'id', $comment->user_id ); + if ( $user ) { + $user_id = $user->ID; + $user_name = $user->display_name; + } } if ( 'id' === $field ) {