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

Timestamp:

03/27/2023 06:19:06 PM (18 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-settings/classes/class-bp-settings-component.php (modified) (6 diffs)

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

@@ -235 +235 @@
         // Menus for logged in user.
         if ( is_user_logged_in() ) {
-
-            // Setup the logged in user variables.
-            $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
+            $settings_slug        = bp_get_settings_slug();
+            $custom_settings_slug = bp_rewrites_get_slug( 'members', 'member_' . $settings_slug, $settings_slug );
 
             // Add main Settings menu.
@@ -244 +243 @@
                 'id'     => 'my-account-' . $this->id,
                 'title'  => __( 'Settings', 'buddypress' ),
-                'href'   => $settings_link,
+                'href'   => bp_loggedin_user_url(
+                    array(
+                        'single_item_component' => $custom_settings_slug,
+                    )
+                ),
             );
 
@@ -252 +255 @@
                 'id'       => 'my-account-' . $this->id . '-general',
                 'title'    => __( 'General', 'buddypress' ),
-                'href'     => trailingslashit( $settings_link . 'general' ),
+                'href'     => bp_loggedin_user_url(
+                    array(
+                        'single_item_component' => $custom_settings_slug,
+                        'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $settings_slug . '_general', 'general' ),
+                    )
+                ),
                 'position' => 10,
             );
@@ -262 +270 @@
                     'id'       => 'my-account-' . $this->id . '-notifications',
                     'title'    => __( 'Email', 'buddypress' ),
-                    'href'     => trailingslashit( $settings_link . 'notifications' ),
+                    'href'     => bp_loggedin_user_url(
+                        array(
+                            'single_item_component' => $custom_settings_slug,
+                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $settings_slug . '_notifications', 'notifications' ),
+                        )
+                    ),
                     'position' => 20,
                 );
@@ -276 +289 @@
                     'id'       => 'my-account-' . $this->id . '-data',
                     'title'    => __( 'Export Data', 'buddypress' ),
-                    'href'     => trailingslashit( $settings_link . 'data' ),
+                    'href'     => bp_loggedin_user_url(
+                        array(
+                            'single_item_component' => $custom_settings_slug,
+                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $settings_slug . '_data', 'data' ),
+                        )
+                    ),
                     'position' => 89,
                 );
@@ -287 +305 @@
                     'id'       => 'my-account-' . $this->id . '-delete-account',
                     'title'    => __( 'Delete Account', 'buddypress' ),
-                    'href'     => trailingslashit( $settings_link . 'delete-account' ),
+                    'href'     => bp_loggedin_user_url(
+                        array(
+                            'single_item_component' => $custom_settings_slug,
+                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $settings_slug . '_delete_account', 'delete-account' ),
+                        )
+                    ),
                     'position' => 90,
                 );