Changeset 5700 for trunk/bp-members/bp-members-loader.php

Timestamp:

02/11/2012 02:29:55 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Members component. Remove signup file and move its code into screens and functions. See #3989.

File:

• trunk/bp-members/bp-members-loader.php (modified) (4 diffs)

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

@@ -34 +34 @@
     function includes() {
         $includes = array(
-            'signup',
             'actions',
             'filters',
@@ -57 +56 @@
      */
     function setup_globals() {
-        global $bp, $current_user, $displayed_user_id;
+        global $bp;
 
         // Define a slug, if necessary
@@ -133 +132 @@
         // Add 'Profile' to the main navigation
         if ( !bp_is_active( 'xprofile' ) ) {
+
             // Don't set up navigation if there's no user
             if ( !is_user_logged_in() && !bp_is_user() )
                 return;
 
+            $sub_nav  = array();
             $main_nav = array(
                 'name'                => __( 'Profile', 'buddypress' ),
@@ -148 +149 @@
             // User links
             $user_domain   = ( isset( $bp->displayed_user->domain ) )               ? $bp->displayed_user->domain               : $bp->loggedin_user->domain;
-            $user_login    = ( isset( $bp->displayed_user->userdata->user_login ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
             $profile_link  = trailingslashit( $user_domain . $bp->profile->slug );