Changeset 13618

Timestamp:

10/22/2023 05:47:26 AM (3 years ago)

Author:

imath

Message:

Make sure to initialize BP_Core_Nav with a user ID

• By default use the logged in ID.
• Use the displayed user ID if available.
• Update 12.0.0 credits.

Props emaralive, awol

Closes ​https://github.com/buddypress/buddypress/pull/177
Fixes #9009
See #9002

Location:

trunk/src

Files:

• bp-core/classes/class-bp-admin.php (modified) (1 diff)
• bp-members/classes/class-bp-members-component.php (modified) (5 diffs)

trunk/src/bp-core/classes/class-bp-admin.php

@@ -1129 +1129 @@
                         </h3>
                         <p class="wp-credits-list">
+                                <a href="https://profiles.wordpress.org/awol/">awol</a>,
                                 <a href="https://profiles.wordpress.org/bouncingsprout/">Ben Roberts (bouncingsprout)</a>,
                                 <a href="https://profiles.wordpress.org/boonebgorges/">Boone B Gorges (boonebgorges)</a>,

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

@@ -231 +231 @@
                 $this->activate_permastruct = bp_get_activate_slug() . '/%' . $this->rewrite_ids['member_activate'] . '%';
 
+                // Init the User's ID to use to build the Nav for.
+                $user_id = bp_loggedin_user_id();
+
                 /** 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() );
+                $bp->loggedin_user->userdata = bp_core_get_core_userdata( $user_id );
 
                 // Fetch the full name for the logged in user.
@@ -241 +244 @@
 
                 // 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() );
+                $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = is_super_admin( $user_id );
 
                 // The domain for the user currently logged in. eg: http://example.com/members/andy.
-                $bp->loggedin_user->domain = bp_members_get_user_url( bp_loggedin_user_id() );
+                $bp->loggedin_user->domain = bp_members_get_user_url( $user_id );
 
                 /**
@@ -252 +255 @@
                  */
                 if ( bp_displayed_user_id() ) {
+                        // We're viewing a speciific user, switch the ID to use for the Nav to this one.
+                        $user_id = 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() );
+                        $bp->displayed_user->userdata = bp_core_get_core_userdata( $user_id );
 
                         // Fetch the full name displayed user.
@@ -259 +265 @@
 
                         // The domain for the user currently being displayed.
-                        $bp->displayed_user->domain = bp_members_get_user_url( bp_displayed_user_id() );
+                        $bp->displayed_user->domain = bp_members_get_user_url( $user_id );
 
                         // If A user is displayed, check if there is a front template
@@ -270 +276 @@
                  */
 
-                $this->nav = new BP_Core_Nav();
+                $this->nav = new BP_Core_Nav( $user_id );
 
                 /** Signup ***********************************************************