Ticket #5950: 5950.patch

src/bp-friends/bp-friends-functions.php

@@ -594 +594 @@
                 $result        = new stdClass();
                 $result->ID    = $user->user_nicename;
                 $result->image = bp_core_fetch_avatar( array( 'html' => false, 'item_id' => $user->ID ) );
-                $result->name  = bp_core_get_user_displayname( $user->ID );
+                $result->name  = $user->user_nicename;
+
+                if ( ! empty( $user->display_name ) ) {
+                        $result->name = $user->display_name;
+                }
 
                 $results[] = $result;
         }
@@ -603 +607 @@
                 'friends' => $results,
         ) );
 }
-add_action( 'bp_activity_mentions_prime_results', 'bp_friends_prime_mentions_results' );
- No newline at end of file
+add_action( 'bp_activity_mentions_prime_results', 'bp_friends_prime_mentions_results' );