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

trunk/bp-members/bp-members-loader.php

@@ -53 +53 @@
      *
      * @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
@@ -62 +61 @@
             define( 'BP_MEMBERS_SLUG', $this->id );
 
-        $globals = array(
+        parent::setup_globals( array(
             'slug'          => BP_MEMBERS_SLUG,
             'root_slug'     => isset( $bp->pages->members->slug ) ? $bp->pages->members->slug : BP_MEMBERS_SLUG,
             'has_directory' => true,
             'search_string' => __( 'Search Members...', 'buddypress' ),
-        );
-
-        parent::setup_globals( $globals );
+        ) );
 
         /** Logged in user ****************************************************/
@@ -105 +102 @@
 
         /** Default Profile Component *****************************************/
+
         if ( !defined( 'BP_DEFAULT_COMPONENT' ) ) {
-            if ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) )
+            if ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) ) {
                 $bp->default_component = bp_get_activity_slug();
-            else
-                $bp->default_component = ( 'xprofile' == $bp->profile->id ) ? 'profile' : $bp->profile->id;
+            } else {
+                $bp->default_component = ( 'xprofile' === $bp->profile->id ) ? 'profile' : $bp->profile->id;
+            }
 
         } else {
@@ -141 +140 @@
     /**
      * 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();
 
         // Add 'Profile' to the main navigation
@@ -151 +148 @@
 
             // Don't set up navigation if there's no user
-            if ( !is_user_logged_in() && !bp_is_user() )
+            if ( !is_user_logged_in() && !bp_is_user() ) {
                 return;
-
-            $sub_nav  = array();
+            }
+
             $main_nav = array(
                 'name'                => __( 'Profile', 'buddypress' ),
@@ -165 +162 @@
 
             // User links
-            $user_domain   = bp_displayed_user_domain() ? bp_displayed_user_domain() : bp_loggedin_user_domain();
-            $profile_link  = trailingslashit( $user_domain . $bp->profile->slug );
+            $user_domain  = bp_displayed_user_domain() ? bp_displayed_user_domain() : bp_loggedin_user_domain();
+            $profile_link = trailingslashit( $user_domain . $bp->profile->slug );
 
             // Add the subnav items to the profile
@@ -188 +185 @@
      */
     function setup_title() {
-        global $bp;
+        $bp = buddypress();
 
         if ( bp_is_my_profile() ) {
@@ -206 +203 @@
 
 function bp_setup_members() {
-    global $bp;
-    $bp->members = new BP_Members_Component();
+    buddypress()->members = new BP_Members_Component();
 }
 add_action( 'bp_setup_components', 'bp_setup_members', 1 );