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

Timestamp:

08/12/2013 10:30:52 PM (13 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-messages/bp-messages-loader.php (modified) (6 diffs)

trunk/bp-messages/bp-messages-loader.php

@@ -40 +40 @@
      */
     public function includes( $includes = array() ) {
+
         // Files to include
         $includes = array(
@@ -63 +64 @@
      *
      * @since BuddyPress (1.5)
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     public function setup_globals( $args = array() ) {
-        global $bp;
+        $bp = buddypress();
 
         // Define a slug, if necessary
@@ -96 +96 @@
     /**
      * Setup BuddyBar navigation
-     *
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
-        $sub_nav = array();
-        $name    = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );
+        $name = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );
 
         // Add 'Messages' to the main navigation
@@ -175 +172 @@
     /**
      * 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
@@ -249 +241 @@
     /**
      * Sets up the title for pages and <title>
-     *
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     function setup_title() {
-        global $bp;
+        $bp = buddypress();
 
         if ( bp_is_messages_component() ) {
@@ -273 +263 @@
 
 function bp_setup_messages() {
-    global $bp;
-    $bp->messages = new BP_Messages_Component();
+    buddypress()->messages = new BP_Messages_Component();
 }
 add_action( 'bp_setup_components', 'bp_setup_messages', 6 );