Ticket #5950: 5950.02.patch

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

@@ -575 +575 @@
  * @see bp_activity_mentions_script()
  */
 function bp_friends_prime_mentions_results() {
-        if ( ! bp_activity_maybe_load_mentions_scripts() ) {
+        $user_id = get_current_user_id();
+
+        // Bail if mentions scripts are disable or current user has many friends
+        if ( ! bp_activity_maybe_load_mentions_scripts() || 100 < (int) friends_get_total_friend_count( $user_id ) ) {
                 return;
         }
 
@@ -584 +587 @@
                 'populate_extras' => false,
 
                 'type'            => 'alphabetical',
-                'user_id'         => get_current_user_id(),
+                'user_id'         => $user_id,
         );
 
         $friends_query = new BP_User_Query( $friends_query );
@@ -594 +597 @@
                 $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 );
+
+                if ( ! empty( $user->display_name ) ) {
+                        $result->name = $user->display_name;
+                } else {
+                        $result->name  = bp_core_get_user_displayname( $user->ID );
+                }
 
                 $results[] = $result;
         }
@@ -603 +611 @@
                 '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' );