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

Timestamp:

08/07/2015 05:52:08 AM (8 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.

File:

• trunk/src/bp-friends/bp-friends-functions.php (modified) (1 diff)

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';
         }
     }