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

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

@@ -218 +218 @@
  */
 function xprofile_insert_field( $args = '' ) {
-    global $bp;
 
     $r = wp_parse_args( $args, array(
@@ -240 +239 @@
 
     // Check this is a valid field type
-    if ( ! in_array( $r['type'], (array) $bp->profile->field_types ) ) {
+    if ( ! in_array( $r['type'], (array) buddypress()->profile->field_types ) ) {
         return false;
     }
@@ -1022 +1021 @@
  */
 function bp_xprofile_get_visibility_levels() {
-    global $bp;
 
     /**
@@ -1031 +1029 @@
      * @param array $visibility_levels Array of visibility levels.
      */
-    return apply_filters( 'bp_xprofile_get_visibility_levels', $bp->profile->visibility_levels );
+    return apply_filters( 'bp_xprofile_get_visibility_levels', buddypress()->profile->visibility_levels );
 }