From f1b64bb73a62c8acffa2050e961c3b8c05558fa8 Mon Sep 17 00:00:00 2001 From: "Md. Rezaul Islam Khan" Date: Fri, 31 Jan 2025 19:02:35 +0600 Subject: [PATCH] [PROD-8526] - Fixed wrong display name when shown to a disconnected user [PROD-8526] - Fixed wrong display name when shown to a disconnected user --- src/bp-members/bp-members-template.php | 4 ++-- src/bp-xprofile/bp-xprofile-filters.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bp-members/bp-members-template.php b/src/bp-members/bp-members-template.php index e15be388e2e..1892e6c7c9a 100644 --- a/src/bp-members/bp-members-template.php +++ b/src/bp-members/bp-members-template.php @@ -949,8 +949,8 @@ function bp_get_member_name() { $full_name = $members_template->member->fullname; } else { $last_name_field_id = bp_xprofile_lastname_field_id(); - if ( in_array( $last_name_field_id, $list_fields ) ) { - $last_name = $members_template->member->fullname; + if ( in_array( $last_name_field_id, $list_fields ) && ! empty( xprofile_get_field_data( $last_name_field_id, $members_template->member->ID ) ) ) { + $last_name = xprofile_get_field_data( $last_name_field_id, $members_template->member->ID ); $full_name = str_replace( ' ' . $last_name, '', $members_template->member->fullname ); } else { $full_name = $members_template->member->fullname; diff --git a/src/bp-xprofile/bp-xprofile-filters.php b/src/bp-xprofile/bp-xprofile-filters.php index 079f5249d15..a4132bb3113 100644 --- a/src/bp-xprofile/bp-xprofile-filters.php +++ b/src/bp-xprofile/bp-xprofile-filters.php @@ -834,7 +834,7 @@ function xprofile_filter_get_user_display_name( $full_name, $user_id, $current_u if ( ! empty( $list_fields ) ) { $last_name_field_id = bp_xprofile_lastname_field_id(); - if ( in_array( $last_name_field_id, $list_fields ) ) { + if ( in_array( $last_name_field_id, $list_fields ) && ! empty( xprofile_get_field_data( $last_name_field_id, $user_id ) ) ) { $last_name = xprofile_get_field_data( $last_name_field_id, $user_id ); $full_name = str_replace( ' ' . $last_name, '', $full_name ); }