Ticket #5436: 5436.03.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
-                $bp->displayed_user->domain   = bp_core_get_user_domain( bp_displayed_user_id() );
-
                 // The core userdata of the user who is currently being displayed
                 $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
 
                 // Fetch the full name displayed user
-                $bp->displayed_user->fullname = bp_core_get_user_displayname( bp_displayed_user_id() );
+                $bp->displayed_user->fullname = $bp->displayed_user->userdata->fullname;
+
+                // The domain for the user currently being displayed
+                $bp->displayed_user->domain   = bp_core_get_user_domain( bp_displayed_user_id() );
 
                 /** Signup ***************************************************/
                 $bp->signup = new stdClass;
@@ -117 +117 @@
                 /** Default Profile Component *****************************************/
 
                 if ( !defined( 'BP_DEFAULT_COMPONENT' ) ) {
-                        if ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) ) {
-                                $bp->default_component = bp_get_activity_slug();
+                        if ( bp_is_active( 'activity' ) ) {
+                                $bp->default_component = $bp->activity->id;
                         } else {
-                                $bp->default_component = ( 'xprofile' === $bp->profile->id ) ? 'profile' : $bp->profile->id;
+                                $bp->default_component = ( 'xprofile' == $bp->profile->id ) ? 'profile' : $bp->profile->id;
                         }
-
                 } else {
                         $bp->default_component = BP_DEFAULT_COMPONENT;
                 }

bp-xprofile/bp-xprofile-functions.php

@@ -418 +418 @@
 }
 
 /**
+ * Replace the displayed and logged-in userss fullnames with the xprofile name, if required.
+ *
+ * The Members component uses the logged-in user's display_name to set the
+ * value of buddypress()->loggedin_user->fullname. However, in cases where
+ * profile sync is disabled, display_name may diverge from the xprofile
+ * fullname field value, and the xprofile field should take precedence.
+ *
+ * Runs at bp_setup_globals:100 to ensure that all components have loaded their
+ * globals before attempting any overrides.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function xprofile_override_user_fullnames() {
+        // If sync is enabled, the two names will match. No need to continue.
+        if ( ! bp_disable_profile_sync() ) {
+                return;
+        }
+
+        if ( bp_loggedin_user_id() ) {
+                buddypress()->loggedin_user->fullname = bp_core_get_user_displayname( bp_loggedin_user_id() );
+        }
+
+        if ( bp_displayed_user_id() ) {
+                buddypress()->displayed_user->fullname = bp_core_get_user_displayname( bp_displayed_user_id() );
+        }
+}
+add_action( 'bp_setup_globals', 'xprofile_override_user_fullnames', 100 );
+
+/**
  * Setup the avatar upload directory for a user.
  *
  * @package BuddyPress Core