Changeset 7347 for trunk/bp-friends/bp-friends-loader.php

Timestamp:

08/12/2013 10:30:52 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Audit loader classes, and remove $bp global touches in lieu of using the buddypress() function. Also some whitespace clean-up.

File:

• trunk/bp-friends/bp-friends-loader.php (modified) (7 diffs)

trunk/bp-friends/bp-friends-loader.php

@@ -31 +31 @@
      */
     public function includes( $includes = array() ) {
-        // Files to include
         $includes = array(
             'actions',
@@ -53 +52 @@
      *
      * @since BuddyPress (1.5)
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     public function setup_globals( $args = array() ) {
-        global $bp;
+        $bp = buddypress();
 
         define ( 'BP_FRIENDS_DB_VERSION', '1800' );
@@ -72 +70 @@
         // All globals for the friends component.
         // Note that global_tables is included in this array.
-        $globals = array(
+        $args = array(
             'slug'                  => BP_FRIENDS_SLUG,
             'has_directory'         => false,
@@ -80 +78 @@
         );
 
-        parent::setup_globals( $globals );
+        parent::setup_globals( $args );
     }
 
     /**
      * Setup BuddyBar navigation
-     *
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-        global $bp;
-
-        $sub_nav = array();
+        $bp = buddypress();
 
         // Add 'Friends' to the main navigation
@@ -140 +134 @@
     /**
      * Set up the Toolbar
-     *
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     public function setup_admin_bar( $wp_admin_nav = array() ) {
-        global $bp;
-
-        // Prevent debug notices
-        $wp_admin_nav = array();
+        $bp = buddypress();
 
         // Menus for logged in user
@@ -196 +185 @@
     /**
      * Sets up the title for pages and <title>
-     *
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     function setup_title() {
-        global $bp;
+        $bp = buddypress();
 
         // Adjust title
@@ -221 +208 @@
 
 function bp_setup_friends() {
-    global $bp;
-    $bp->friends = new BP_Friends_Component();
+    buddypress()->friends = new BP_Friends_Component();
 }
 add_action( 'bp_setup_components', 'bp_setup_friends', 6 );