Changeset 9471 for trunk/src/bp-friends/bp-friends-filters.php

Timestamp:

02/10/2015 02:49:16 AM (10 years ago)

Author:

johnjamesjacoby

Message:

Replace all remaining $bp global touches with buddypress().

All existing tests continue to pass as normal. I will further manually scrutinize each replacement to ensure correctness.

Fixes #5138. Any stragglers or updates will reference this ticket.

File:

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

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

@@ -16 +16 @@
  * @since BuddyPress (1.7.0)
  *
- * @global BuddyPress $bp Global BuddyPress settings.
  * @global WPDB $wpdb WordPress database access object.
  *
@@ -24 +23 @@
  */
 function bp_friends_filter_user_query_populate_extras( BP_User_Query $user_query, $user_ids_sql ) {
-    global $bp, $wpdb;
+    global $wpdb;
 
     // stop if user isn't logged in
@@ -30 +29 @@
         return;
     }
+
+    $bp = buddypress();
 
     // Fetch whether or not the user is a friend of the current user