Changeset 9471 for trunk/src/bp-core/admin/bp-core-tools.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-core/admin/bp-core-tools.php (modified) (4 diffs)

trunk/src/bp-core/admin/bp-core-tools.php

@@ -156 +156 @@
  */
 function bp_admin_repair_friend_count() {
-    global $wpdb, $bp;
+    global $wpdb;
 
     if ( ! bp_is_active( 'friends' ) ) {
@@ -169 +169 @@
         return array( 1, sprintf( $statement, $result ) );
     }
+
+    $bp = buddypress();
 
     // Walk through all users on the site
@@ -212 +214 @@
  */
 function bp_admin_repair_group_count() {
-    global $wpdb, $bp;
+    global $wpdb;
 
     if ( ! bp_is_active( 'groups' ) ) {
@@ -225 +227 @@
         return array( 1, sprintf( $statement, $result ) );
     }
+
+    $bp = buddypress();
 
     // Walk through all users on the site