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

trunk/bp-groups/bp-groups-loader.php

@@ -119 +119 @@
          *
          * @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
@@ -137 +136 @@
                 // All globals for groups component.
                 // Note that global_tables is included in this array.
-                $globals = array(
+                $args = array(
                         'slug'                  => BP_GROUPS_SLUG,
                         'root_slug'             => isset( $bp->pages->groups->slug ) ? $bp->pages->groups->slug : BP_GROUPS_SLUG,
@@ -146 +145 @@
                 );
 
-                parent::setup_globals( $globals );
+                parent::setup_globals( $args );
 
                 /** Single Group Globals **********************************************/
@@ -339 +338 @@
         public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
-                // Define local variables
-                $sub_nav = array();
-
                 // Add 'Groups' to the main navigation
                 $main_nav = array(
@@ -489 +485 @@
                 }
 
-                if ( isset( $this->current_group->user_has_access ) )
+                if ( isset( $this->current_group->user_has_access ) ) {
                         do_action( 'groups_setup_nav', $this->current_group->user_has_access );
-                else
+                } else {
                         do_action( 'groups_setup_nav');
+                }
         }
 
         /**
          * 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
@@ -563 +555 @@
         /**
          * 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_groups_component() ) {
 
                         if ( bp_is_my_profile() && !bp_is_single_item() ) {
-
                                 $bp->bp_options_title = __( 'Memberships', 'buddypress' );
 
                         } else if ( !bp_is_my_profile() && !bp_is_single_item() ) {
-
                                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(
                                         'item_id' => bp_displayed_user_id(),
@@ -595 +583 @@
                                         'alt'        => __( 'Group Avatar', 'buddypress' )
                                 ) );
+
                                 if ( empty( $bp->bp_options_avatar ) ) {
-                                        $bp->bp_options_avatar = '<img src="' . esc_attr( $group->avatar_full ) . '" class="avatar" alt="' . esc_attr( $group->name ) . '" />';
+                                        $bp->bp_options_avatar = bp_group_current_avatar();
                                 }
                         }
@@ -607 +596 @@
 
 function bp_setup_groups() {
-        global $bp;
-
-        $bp->groups = new BP_Groups_Component();
+        buddypress()->groups = new BP_Groups_Component();
 }
 add_action( 'bp_setup_components', 'bp_setup_groups', 6 );