Changeset 13087 for trunk/src/bp-members/classes/class-bp-members-component.php

Timestamp:

08/22/2021 04:47:17 PM (5 years ago)

Author:

imath

Message:

Add a new method to the Members & Groups components main class

BP_Members_Component::setup_additional_globals() & BP_Groups_Component::setup_additional_globals() are used to set specific components globals that are not passed to BP_Component::setup_globals(). This commit also makes sure the BP Nouveau template pack uses a consistent object ID for its directory navigation.

Fixes #8555

File:

• trunk/src/bp-members/classes/class-bp-members-component.php (modified) (2 diffs)

trunk/src/bp-members/classes/class-bp-members-component.php

@@ -153 +153 @@
                         require $this->path . 'bp-members/screens/invitations.php';
                 }
+        }
+
+        /**
+         * Set up additional globals for the component.
+         *
+         * @since 10.0.0
+         */
+        public function setup_additional_globals() {
+                $bp = buddypress();
+
+                /** 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 = isset( $bp->loggedin_user->userdata->display_name ) ? $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() );
+
+                // The domain for the user currently logged in. eg: http://example.com/members/andy.
+                $bp->loggedin_user->domain = bp_core_get_user_domain( bp_loggedin_user_id() );
+
+                /** Displayed user ***************************************************
+                 */
+
+                // 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 = isset( $bp->displayed_user->userdata->display_name ) ? $bp->displayed_user->userdata->display_name : '';
+
+                // The domain for the user currently being displayed.
+                $bp->displayed_user->domain = bp_core_get_user_domain( bp_displayed_user_id() );
+
+                // If A user is displayed, check if there is a front template
+                if ( bp_get_displayed_user() ) {
+                        $bp->displayed_user->front_template = bp_displayed_user_get_front_template();
+                }
+
+                /** Initialize the nav for the members component *********************
+                 */
+
+                $this->nav = new BP_Core_Nav();
+
+                /** Signup ***********************************************************
+                 */
+
+                $bp->signup = new stdClass;
+
+                /** Profiles Fallback ************************************************
+                 */
+
+                if ( ! bp_is_active( 'xprofile' ) ) {
+                        $bp->profile       = new stdClass;
+                        $bp->profile->slug = 'profile';
+                        $bp->profile->id   = 'profile';
+                }
+
+                /** Network Invitations **************************************************
+                 */
+
+                $bp->members->invitations = new stdClass;
         }
 
@@ -213 +278 @@
                 parent::setup_globals( $args );
 
-                /** 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       = isset( $bp->loggedin_user->userdata->display_name ) ? $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() );
-
-                // The domain for the user currently logged in. eg: http://example.com/members/andy.
-                $bp->loggedin_user->domain         = bp_core_get_user_domain( bp_loggedin_user_id() );
-
-                /** Displayed user ***************************************************
-                 */
-
-                // 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 = isset( $bp->displayed_user->userdata->display_name ) ? $bp->displayed_user->userdata->display_name : '';
-
-                // The domain for the user currently being displayed.
-                $bp->displayed_user->domain   = bp_core_get_user_domain( bp_displayed_user_id() );
-
-                // Initialize the nav for the members component.
-                $this->nav = new BP_Core_Nav();
-
-                // If A user is displayed, check if there is a front template
-                if ( bp_get_displayed_user() ) {
-                        $bp->displayed_user->front_template = bp_displayed_user_get_front_template();
-                }
-
-                /** Signup ***********************************************************
-                 */
-
-                $bp->signup = new stdClass;
-
-                /** Profiles Fallback ************************************************
-                 */
-
-                if ( ! bp_is_active( 'xprofile' ) ) {
-                        $bp->profile       = new stdClass;
-                        $bp->profile->slug = 'profile';
-                        $bp->profile->id   = 'profile';
-                }
-
-                /** Network Invitations **************************************************
-                 */
-
-                $bp->members->invitations = new stdClass;
+                // Additional globals.
+                $this->setup_additional_globals();
         }