Changeset 10037

Timestamp:

08/07/2015 05:52:08 AM (9 years ago)

Author:

r-a-y

Message:

Friends: Fix issue with using friends_check_friendship_status() during the members loop when the legacy user query is enabled.

Previously, if the legacy user query was enabled, the friendship button in
the members loop would always return "Add Friend" regardless of the actual
friendship status.

This commit fixes this by setting the 'not_friends' status inside the
the bp_friends_filter_user_query_populate_extras() function instead of
in friends_check_friendship_status().

Fixes #6577.

Location:

trunk/src/bp-friends

Files:

• bp-friends-filters.php (modified) (2 diffs)
• bp-friends-functions.php (modified) (1 diff)

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

@@ -35 +35 @@
     $friend_status = $wpdb->get_results( $wpdb->prepare( "SELECT initiator_user_id, friend_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id IN ( {$user_ids_sql} ) ) OR (initiator_user_id IN ( {$user_ids_sql} ) AND friend_user_id = %d )", bp_loggedin_user_id(), bp_loggedin_user_id() ) );
 
+    // Keep track of members that have a friendship status with the current user
+    $friend_user_ids = array();
+
     // The "friend" is the user ID in the pair who is *not* the logged in user
     foreach ( (array) $friend_status as $fs ) {
         $friend_id = bp_loggedin_user_id() == $fs->initiator_user_id ? $fs->friend_user_id : $fs->initiator_user_id;
+        $friend_user_ids[] = $friend_id;
 
         if ( isset( $user_query->results[ $friend_id ] ) ) {
@@ -50 +54 @@
         }
     }
+
+    // The rest are not friends with the current user, so set status accordingly
+    $not_friends = array_diff( $user_query->user_ids, $friend_user_ids );
+    foreach ( (array) $not_friends as $nf ) {
+        if ( bp_loggedin_user_id() == $nf ) {
+            continue;
+        }
+        $user_query->results[ $nf ]->friendship_status = 'not_friends';
+    }
+
 }
 add_filter( 'bp_user_query_populate_extras', 'bp_friends_filter_user_query_populate_extras', 4, 2 );

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

@@ -283 +283 @@
         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';
         }
     }