Changeset 13441 for trunk/src/bp-xprofile/classes/class-bp-xprofile-component.php

Timestamp:

03/23/2023 07:35:38 PM (18 months ago)

Author:

imath

Message:

Make BP_Core_Nav generate "BP Rewrites ready" navigation links

• Remove all components $parent_url attributes when setting sub nav items.
• Only use the bp_core_create_nav_link() $link attribute argument & the bp_core_create_subnav_link() $parent_url attribute argument if specified to preserve backward compatibility.
• Migrates the Community search feature so that it uses BP Rewrites.
• Perform some bp_loggedin_user_domain() in favor of bp_loggedin_user_url().
• Update some PHPUnit tests.

Props r-a-y, johnjamesjacoby, boonebgorges

Closes ​https://github.com/buddypress/buddypress/pull/77
See #4954

File:

• trunk/src/bp-xprofile/classes/class-bp-xprofile-component.php (modified) (5 diffs)

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

@@ -230 +230 @@
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
-        // Determine user to use.
-        if ( bp_displayed_user_domain() ) {
-            $user_domain = bp_displayed_user_domain();
-        } elseif ( bp_loggedin_user_domain() ) {
-            $user_domain = bp_loggedin_user_domain();
-        } else {
+        // Stop if there is no user displayed or logged in.
+        if ( ! is_user_logged_in() && ! bp_displayed_user_id() ) {
             return;
         }
 
-        $access       = bp_core_can_edit_settings();
-        $slug         = bp_get_profile_slug();
-        $profile_link = trailingslashit( $user_domain . $slug );
+        $access = bp_core_can_edit_settings();
+        $slug   = bp_get_profile_slug();
 
         // Add 'Profile' to the main navigation.
@@ -257 +252 @@
             'name'            => _x( 'View', 'Profile header sub menu', 'buddypress' ),
             'slug'            => 'public',
-            'parent_url'      => $profile_link,
             'parent_slug'     => $slug,
             'screen_function' => 'xprofile_screen_display_profile',
@@ -267 +261 @@
             'name'            => _x( 'Edit','Profile header sub menu', 'buddypress' ),
             'slug'            => 'edit',
-            'parent_url'      => $profile_link,
             'parent_slug'     => $slug,
             'screen_function' => 'xprofile_screen_edit_profile',
@@ -294 +287 @@
         }
 
-        // Determine user to use.
-        if ( bp_displayed_user_domain() ) {
-            $user_domain = bp_displayed_user_domain();
-        } elseif ( bp_loggedin_user_domain() ) {
-            $user_domain = bp_loggedin_user_domain();
-        } else {
+        // Stop if there is no user displayed or logged in.
+        if ( ! is_user_logged_in() && ! bp_displayed_user_id() ) {
             return;
         }
@@ -309 +298 @@
             'name'            => _x( 'Profile Visibility', 'Profile settings sub nav', 'buddypress' ),
             'slug'            => 'profile',
-            'parent_url'      => trailingslashit( $user_domain . $settings_slug ),
             'parent_slug'     => $settings_slug,
             'screen_function' => 'bp_xprofile_screen_settings',