Changeset 7347 for trunk/bp-blogs/bp-blogs-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-blogs/bp-blogs-loader.php (modified) (9 diffs)

trunk/bp-blogs/bp-blogs-loader.php

@@ -35 +35 @@
      *
      * @since BuddyPress (1.5)
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     public function setup_globals( $args = array() ) {
-        global $bp;
+        $bp = buddypress();
 
         if ( !defined( 'BP_BLOGS_SLUG' ) )
@@ -51 +50 @@
         // All globals for messaging component.
         // Note that global_tables is included in this array.
-        $globals = array(
+        $args = array(
             'slug'                  => BP_BLOGS_SLUG,
             'root_slug'             => isset( $bp->pages->blogs->slug ) ? $bp->pages->blogs->slug : BP_BLOGS_SLUG,
@@ -62 +61 @@
 
         // Setup the globals
-        parent::setup_globals( $globals );
+        parent::setup_globals( $args );
     }
 
@@ -91 +90 @@
     /**
      * Setup BuddyBar navigation
-     *
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-        global $bp;
+        $bp = buddypress();
 
         /**
@@ -104 +101 @@
         if ( !is_multisite() )
             return false;
-
-        $sub_nav = array();
 
         // Add 'Sites' to the main navigation
@@ -147 +142 @@
      */
     public function setup_admin_bar( $wp_admin_nav = array() ) {
-        global $bp;
+        $bp = buddypress();
 
         /**
@@ -156 +151 @@
         if ( !is_multisite() )
             return false;
-
-        // Prevent debug notices
-        $wp_admin_nav = array();
 
         // Menus for logged in user
@@ -197 +189 @@
     /**
      * Sets up the title for pages and <title>
-     *
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     function setup_title() {
-        global $bp;
+        $bp = buddypress();
 
         // Set up the component options navigation for Blog
@@ -227 +217 @@
 
 function bp_setup_blogs() {
-    global $bp;
-    $bp->blogs = new BP_Blogs_Component();
+    buddypress()->blogs = new BP_Blogs_Component();
 }
 add_action( 'bp_setup_components', 'bp_setup_blogs', 6 );