Ticket #5436: 5436.02.patch

bp-core/bp-core-loader.php

@@ -261 +261 @@
 function bp_setup_core() {
         buddypress()->core = new BP_Core();
 }
-add_action( 'bp_setup_components', 'bp_setup_core', 2 );
+add_action( 'bp_loaded', 'bp_setup_core', 0 );

bp-members/bp-members-loader.php

@@ -80 +80 @@
 
                 /** Logged in user ****************************************************/
 
+                // The core userdata of the user who is currently logged in.
+                $bp->loggedin_user->userdata       = bp_core_get_core_userdata( bp_loggedin_user_id() );
+
                 // Fetch the full name for the logged in user
-                $bp->loggedin_user->fullname       = bp_core_get_user_displayname( bp_loggedin_user_id() );
+                $bp->loggedin_user->fullname       = $bp->loggedin_user->userdata->display_name;
 
                 // Hits the DB on single WP installs so get this separately
                 $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = is_super_admin( bp_loggedin_user_id() );
@@ -89 +92 @@
                 // The domain for the user currently logged in. eg: http://domain.com/members/andy
                 $bp->loggedin_user->domain         = bp_core_get_user_domain( bp_loggedin_user_id() );
 
-                // The core userdata of the user who is currently logged in.
-                $bp->loggedin_user->userdata       = bp_core_get_core_userdata( bp_loggedin_user_id() );
-
                 /** Displayed user ****************************************************/
 
                 // The domain for the user currently being displayed
@@ -118 +118 @@
 
                 if ( !defined( 'BP_DEFAULT_COMPONENT' ) ) {
                         if ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) ) {
-                                $bp->default_component = bp_get_activity_slug();
+                                $bp->default_component = $bp->activity->id;
                         } else {
                                 $bp->default_component = ( 'xprofile' === $bp->profile->id ) ? 'profile' : $bp->profile->id;
                         }

bp-xprofile/bp-xprofile-loader.php

@@ -154 +154 @@
                 );
 
                 parent::setup_globals( $globals );
+
+                // Replace the logged-in user's WP display_name with BP's, if necessary
+                if ( bp_loggedin_user_id() && bp_disable_profile_sync() ) {
+                        buddypress()->loggedin_user->fullname = bp_core_get_user_displayname( bp_loggedin_user_id() );
+                }
         }
 
         /**