Ticket #5436: 5436.04.patch

src/bp-core/bp-core-actions.php

@@ -66 +66 @@
  */
 add_action( 'bp_init', 'bp_core_set_uri_globals',    2  );
 add_action( 'bp_init', 'bp_setup_globals',           4  );
+add_action( 'bp_init', 'bp_setup_canonical_stack',   5  );
 add_action( 'bp_init', 'bp_setup_nav',               6  );
 add_action( 'bp_init', 'bp_setup_title',             8  );
 add_action( 'bp_init', 'bp_core_load_admin_bar_css', 12 );

src/bp-core/bp-core-component.php

@@ -338 +338 @@
                 // Setup globals
                 add_action( 'bp_setup_globals',          array( $this, 'setup_globals'          ), 10 );
 
+                // Set up canonical stack
+                add_action( 'bp_setup_canonical_stack',  array( $this, 'setup_canonical_stack'  ), 10 );
+
                 // Include required files. Called early to ensure that BP core
                 // components are loaded before plugins that hook their loader functions
                 // to bp_include with the default priority of 10. This is for backwards
@@ -380 +383 @@
         }
 
         /**
+         * Set up the canonical URL stack for this component.
+         *
+         * @since BuddyPress (2.1.0)
+         */
+        public function setup_canonical_stack() {}
+
+        /**
          * Set up component navigation.
          *
          * @see bp_core_new_nav_item() For a description of the $main_nav

src/bp-core/bp-core-dependency.php

@@ -32 +32 @@
 }
 
 /**
+ * Fire the 'bp_setup_canonical_stack' action, where plugins should set up their canonical URL.
+ */
+function bp_setup_canonical_stack() {
+        do_action( 'bp_setup_canonical_stack' );
+}
+
+/**
  * Fire the 'bp_setup_globals' action, where plugins should initialize global settings.
  */
 function bp_setup_globals() {

src/bp-core/bp-core-loader.php

@@ -263 +263 @@
 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 );

src/bp-groups/bp-groups-loader.php

@@ -241 +241 @@
                         return;
                 }
 
-                if ( bp_is_groups_component() && !empty( $this->current_group ) ) {
-
-                        $this->default_extension = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'home' );
-
-                        if ( !bp_current_action() ) {
-                                $bp->current_action = $this->default_extension;
-                        }
-
-                        // Prepare for a redirect to the canonical URL
-                        $bp->canonical_stack['base_url'] = bp_get_group_permalink( $this->current_group );
-
-                        if ( bp_current_action() ) {
-                                $bp->canonical_stack['action'] = bp_current_action();
-                        }
-
-                        if ( !empty( $bp->action_variables ) ) {
-                                $bp->canonical_stack['action_variables'] = bp_action_variables();
-                        }
-
-                        // When viewing the default extension, the canonical URL should not have
-                        // that extension's slug, unless more has been tacked onto the URL via
-                        // action variables
-                        if ( bp_is_current_action( $this->default_extension ) && empty( $bp->action_variables ) )  {
-                                unset( $bp->canonical_stack['action'] );
-                        }
-
-                }
-
                 // Group access control
                 if ( bp_is_groups_component() && !empty( $this->current_group ) ) {
                         if ( !$this->current_group->user_has_access ) {
@@ -350 +322 @@
         }
 
         /**
+         * Set up canonical stack for this component.
+         *
+         * @since BuddyPress (2.1.0)
+         */
+        public function setup_canonical_stack() {
+                $bp = buddypress();
+
+                if ( bp_is_groups_component() && !empty( $this->current_group ) ) {
+
+                        $this->default_extension = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'home' );
+
+                        if ( !bp_current_action() ) {
+                                $bp->current_action = $this->default_extension;
+                        }
+
+                        // Prepare for a redirect to the canonical URL
+                        $bp->canonical_stack['base_url'] = bp_get_group_permalink( $this->current_group );
+
+                        if ( bp_current_action() ) {
+                                $bp->canonical_stack['action'] = bp_current_action();
+                        }
+
+                        if ( !empty( $bp->action_variables ) ) {
+                                $bp->canonical_stack['action_variables'] = bp_action_variables();
+                        }
+
+                        // When viewing the default extension, the canonical URL should not have
+                        // that extension's slug, unless more has been tacked onto the URL via
+                        // action variables
+                        if ( bp_is_current_action( $this->default_extension ) && empty( $bp->action_variables ) )  {
+                                unset( $bp->canonical_stack['action'] );
+                        }
+
+                }
+        }
+
+        /**
          * Setup BuddyBar navigation
          *
          * @global BuddyPress $bp The one true BuddyPress instance

src/bp-members/bp-members-loader.php

@@ -89 +89 @@
 
                 /** 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() );
@@ -98 +101 @@
                 // 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 = isset( $bp->displayed_user->userdata->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;
@@ -122 +122 @@
                         $bp->profile->slug = 'profile';
                         $bp->profile->id   = 'profile';
                 }
+        }
+
+        /**
+         * Set up canonical stack for this component.
+         *
+         * @since BuddyPress (2.1.0)
+         */
+        public function setup_canonical_stack() {
+                $bp = buddypress();
 
                 /** Default Profile Component *****************************************/
 

src/bp-xprofile/bp-xprofile-functions.php

@@ -460 +460 @@
 }
 
 /**
+ * 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

src/bp-xprofile/bp-xprofile-loader.php

@@ -350 +350 @@
         if ( !isset( $bp->profile->id ) )
                 $bp->profile = new BP_XProfile_Component();
 }
-add_action( 'bp_setup_components', 'bp_setup_xprofile', 6 );
+add_action( 'bp_setup_components', 'bp_setup_xprofile', 2 );