Changeset 8514 for trunk/src/bp-friends/bp-friends-functions.php

Timestamp:

06/14/2014 06:49:55 PM (9 years ago)

Author:

r-a-y

Message:

Check BP_User_Query when using friends_check_friendship_status().

Previously, friends_check_friendship_status() did not reference the data
already queried in the members loop via BP_User_Query. As a result, if
a user was logged in and viewing the member directory, this added twenty
additional DB queries to the page.

This commit:

• Adds an additional property - friendship_status - to bp_friends_filter_user_query_populate_extras(). This property references the various friendship statuses from BP_Friends_Friendship::check_is_friend()
• Checks this new property in friends_check_friendship_status() before querying the DB
• Adds unit tests

Props r-a-y, boonebgorges.

Fixes #5703.

File:

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

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

@@ -196 +196 @@
  * Get the friendship status of two friends.
  *
- * Will return 'is_friends', 'not_friends', or 'pending'.
+ * Will return 'is_friends', 'not_friends', 'pending' or 'awaiting_response'.
  *
  * @param int $user_id ID of the first user.
@@ -203 +203 @@
  */
 function friends_check_friendship_status( $user_id, $possible_friend_id ) {
+    global $members_template;
+
+    // check the BP_User_Query first
+    // @see bp_friends_filter_user_query_populate_extras()
+    if ( ! empty( $members_template->in_the_loop ) ) {
+        if ( isset( $members_template->member->friendship_status ) ) {
+            return $members_template->member->friendship_status;
+
+        // make sure that the friends BP_User_Query was registered before assuming
+        // status as 'not_friends'
+        } elseif ( has_filter( 'bp_user_query_populate_extras', 'bp_friends_filter_user_query_populate_extras' ) ) {
+            return 'not_friends';
+        }
+    }
+
     return BP_Friends_Friendship::check_is_friend( $user_id, $possible_friend_id );
 }