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

Timestamp:

03/27/2023 06:19:06 PM (19 months ago)

Author:

imath

Message:

Improve Components Member's single item navigation generation

• Edit the BP_Component Class so that it globalize navigation items before registering it.
• Introduce bp_get_component_navigations(), a new function that will be used to get Member's single navigation customizable slugs within the BuddyPress settings area.
• Perform all remaining bp_loggedin_user_domain() replacements (55) in favor of the bp_loggedin_user_url() function which uses BP Rewrites to build URLs.
• Improve bp_loggedin_user_link() by adding a new $chunks array of arguments to output escaped URL in templates.
• Adapt some PHPUnit testcases.

Props r-a-y, johnjamesjacoby, boonebgorges

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

File:

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

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

@@ -316 +316 @@
         // Menus for logged in user.
         if ( is_user_logged_in() ) {
-
-            // Profile link.
-            $profile_link = trailingslashit( bp_loggedin_user_domain() . bp_get_profile_slug() );
+            $profile_slug = bp_get_profile_slug();
+            $path_chunks  = array(
+                'single_item_component' => bp_rewrites_get_slug( 'members', 'member_' . $profile_slug, $profile_slug ),
+            );
 
             // Add the "Profile" sub menu.
@@ -325 +326 @@
                 'id'     => 'my-account-' . $this->id,
                 'title'  => _x( 'Profile', 'My Account Profile', 'buddypress' ),
-                'href'   => $profile_link,
+                'href'   => bp_loggedin_user_url( $path_chunks ),
             );
+
+            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', 'member_' . $profile_slug . '_public', 'public' );
 
             // View Profile.
@@ -333 +336 @@
                 'id'       => 'my-account-' . $this->id . '-public',
                 'title'    => _x( 'View', 'My Account Profile sub nav', 'buddypress' ),
-                'href'     => trailingslashit( $profile_link . 'public' ),
+                'href'     => bp_loggedin_user_url( $path_chunks ),
                 'position' => 10,
             );
+
+            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', 'member_' . $profile_slug . '_edit', 'edit' );
 
             // Edit Profile.
@@ -342 +347 @@
                 'id'       => 'my-account-' . $this->id . '-edit',
                 'title'    => _x( 'Edit', 'My Account Profile sub nav', 'buddypress' ),
-                'href'     => trailingslashit( $profile_link . 'edit' ),
+                'href'     => bp_loggedin_user_url( $path_chunks ),
                 'position' => 20,
             );
@@ -417 +422 @@
 
         // Setup the logged in user variables.
-        $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
+        $settings_slug = bp_get_settings_slug();
+        $path_chunks   = array(
+            'single_item_component' => bp_rewrites_get_slug( 'members', 'member_' . $settings_slug, $settings_slug ),
+            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $settings_slug . '_profile', 'profile' ),
+        );
 
         // Add the "Profile" subnav item.
@@ -424 +433 @@
             'id'     => 'my-account-' . buddypress()->settings->id . '-profile',
             'title'  => _x( 'Profile', 'My Account Settings sub nav', 'buddypress' ),
-            'href'   => trailingslashit( $settings_link . 'profile' ),
+            'href'   => bp_loggedin_user_url( $path_chunks ),
         );