Changeset 13441 for trunk/src/bp-members/classes/class-bp-members-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-members/classes/class-bp-members-component.php (modified) (6 diffs)

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

@@ -429 +429 @@
         $subnavs = array();
 
-        $access       = bp_core_can_edit_settings();
-        $slug         = bp_get_profile_slug();
-        $profile_link = bp_get_members_component_link( buddypress()->profile->id );
+        $access = bp_core_can_edit_settings();
+        $slug   = bp_get_profile_slug();
 
         // Change Avatar.
@@ -438 +437 @@
                 'name'            => _x( 'Change Profile Photo', 'Profile header sub menu', 'buddypress' ),
                 'slug'            => 'change-avatar',
-                'parent_url'      => $profile_link,
                 'parent_slug'     => $slug,
                 'screen_function' => 'bp_members_screen_change_avatar',
@@ -451 +449 @@
                 'name'            => _x( 'Change Cover Image', 'Profile header sub menu', 'buddypress' ),
                 'slug'            => 'change-cover-image',
-                'parent_url'      => $profile_link,
                 'parent_slug'     => $slug,
                 'screen_function' => 'bp_members_screen_change_cover_image',
@@ -486 +483 @@
         if ( ! bp_displayed_user_has_front_template() && $is_xprofile_active ) {
             add_action( 'bp_xprofile_setup_nav', array( $this, 'setup_xprofile_nav' ) );
-            return;
-        }
-
-        // 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 {
             return;
         }
@@ -534 +522 @@
             'name'            => _x( 'View', 'Member profile view', 'buddypress' ),
             'slug'            => 'public',
-            'parent_url'      => trailingslashit( $user_domain . $slug ),
             'parent_slug'     => $slug,
             'screen_function' => 'bp_members_screen_display_profile',
@@ -556 +543 @@
             $front_subnav = $this->sub_nav;
             $front_subnav['parent_slug'] = 'front';
-
-            // In case the subnav is displayed in the front template
-            $front_subnav['parent_url'] = trailingslashit( $user_domain . 'front' );
 
             // Set the subnav