Changeset 9471 for trunk/src/bp-core/bp-core-buddybar.php

Timestamp:

02/10/2015 02:49:16 AM (11 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/bp-core-buddybar.php (modified) (12 diffs)

trunk/src/bp-core/bp-core-buddybar.php

@@ -14 +14 @@
 /**
  * Add an item to the main BuddyPress navigation array.
- *
- * @global BuddyPress $bp The one true BuddyPress instance.
  *
  * @param array $args {
@@ -39 +37 @@
  */
 function bp_core_new_nav_item( $args = '' ) {
-    global $bp;
+    $bp = buddypress();
 
     $defaults = array(
@@ -120 +118 @@
  * Modify the default subnav item that loads when a top level nav item is clicked.
  *
- * @global BuddyPress $bp The one true BuddyPress instance.
- *
  * @param array $args {
  *     @type string $parent_slug The slug of the nav item whose default is
@@ -131 +127 @@
  */
 function bp_core_new_nav_default( $args = '' ) {
-    global $bp;
+    $bp = buddypress();
 
     $defaults = array(
@@ -196 +192 @@
  * after all plugins have had a chance to register their navigation items.
  *
- * @global BuddyPress $bp The one true BuddyPress instance
- *
  * @return bool|null Returns false on failure.
  */
 function bp_core_sort_nav_items() {
-    global $bp;
+    $bp = buddypress();
 
     if ( empty( $bp->bp_nav ) || !is_array( $bp->bp_nav ) )
@@ -229 +223 @@
 /**
  * Add a subnav item to the BuddyPress navigation.
- *
- * @global BuddyPress $bp The one true BuddyPress instance.
  *
  * @param array $args {
@@ -261 +253 @@
  */
 function bp_core_new_subnav_item( $args = '' ) {
-    global $bp;
+    $bp = buddypress();
 
     $r = wp_parse_args( $args, array(
@@ -442 +434 @@
  * Sort all subnavigation arrays.
  *
- * @global BuddyPress $bp The one true BuddyPress instance
- *
  * @return bool|null Returns false on failure.
  */
 function bp_core_sort_subnav_items() {
-    global $bp;
+    $bp = buddypress();
 
     if ( empty( $bp->bp_options_nav ) || !is_array( $bp->bp_options_nav ) )
@@ -487 +477 @@
  */
 function bp_nav_item_has_subnav( $nav_item = '' ) {
-    global $bp;
+    $bp = buddypress();
 
     if ( !$nav_item )
@@ -504 +494 @@
  */
 function bp_core_remove_nav_item( $parent_id ) {
-    global $bp;
+    $bp = buddypress();
 
     // Unset subnav items for this nav item
@@ -533 +523 @@
  */
 function bp_core_remove_subnav_item( $parent_id, $slug ) {
-    global $bp;
-
-    $screen_function = isset( $bp->bp_options_nav[$parent_id][$slug]['screen_function'] ) ? $bp->bp_options_nav[$parent_id][$slug]['screen_function'] : false;
+    $bp = buddypress();
+
+    $screen_function = isset( $bp->bp_options_nav[$parent_id][$slug]['screen_function'] )
+        ? $bp->bp_options_nav[$parent_id][$slug]['screen_function']
+        : false;
 
     if ( ! empty( $screen_function ) ) {
@@ -553 +545 @@
  * Clear all subnav items from a specific nav item.
  *
- * @global BuddyPress $bp The one true BuddyPress instance.
- *
  * @param string $parent_slug The slug of the parent navigation item.
  */
 function bp_core_reset_subnav_items( $parent_slug ) {
-    global $bp;
+    $bp = buddypress();
 
     unset( $bp->bp_options_nav[$parent_slug] );