Changeset 7999 for trunk/bp-friends/bp-friends-filters.php

Timestamp:

02/27/2014 08:20:25 PM (11 years ago)

Author:

r-a-y

Message:

Don't query friendship status in BP_User_Query for logged-out users.

The bp_friends_filter_user_query_populate_extras() function is used to
add the confirmed friendship status against the logged-in user to the
existing user query.

However, we don't need to run this query if a user isn't logged in.

See #5435.

File:

• trunk/bp-friends/bp-friends-filters.php (modified) (2 diffs)

trunk/bp-friends/bp-friends-filters.php

@@ -9 +9 @@
 
 /**
- * Filter BP_User_Query::populate_extras to override each queried users fullname.
+ * Filter BP_User_Query::populate_extras to add confirmed friendship status.
+ *
+ * Each member in the user query is checked for confirmed friendship status
+ * against the logged-in user.
  *
  * @since BuddyPress (1.7.0)
@@ -22 +25 @@
 function bp_friends_filter_user_query_populate_extras( BP_User_Query $user_query, $user_ids_sql ) {
     global $bp, $wpdb;
+
+    // stop if user isn't logged in
+    if ( ! is_user_logged_in() ) {
+        return;
+    }
 
     // Fetch whether or not the user is a friend of the current user