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

Timestamp:

06/18/2023 04:11:04 AM (3 years ago)

Author:

imath

Message:

BP Rewrites: optimize the code used to build URLs

The bp_members_get_path_chunks() & bp_groups_get_path_chunks() functions are making sure URL chunks are customized according to the slugs settings. Instead of redoing at many places all or some of the operations performed by these functions, update the code to build URLs so that it uses these functions.

See #4954
Fixes #8923
Closes ​https://github.com/buddypress/buddypress/pull/117

File:

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

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

@@ -240 +240 @@
                 // Menus for logged in user.
                 if ( is_user_logged_in() ) {
-                        $settings_slug        = bp_get_settings_slug();
-                        $custom_settings_slug = bp_rewrites_get_slug( 'members', 'member_' . $settings_slug, $settings_slug );
+                        $settings_slug = bp_get_settings_slug();
 
                         // Add main Settings menu.
@@ -248 +247 @@
                                 'id'     => 'my-account-' . $this->id,
                                 'title'  => __( 'Settings', 'buddypress' ),
-                                'href'   => bp_loggedin_user_url(
-                                        array(
-                                                'single_item_component' => $custom_settings_slug,
-                                        )
-                                ),
+                                'href'   => bp_loggedin_user_url( bp_members_get_path_chunks( array( $settings_slug ) ) ),
                         );
 
@@ -260 +255 @@
                                 'id'       => 'my-account-' . $this->id . '-general',
                                 'title'    => __( 'General', 'buddypress' ),
-                                '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' ),
-                                        )
-                                ),
+                                'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $settings_slug, 'general' ) ) ),
                                 'position' => 10,
                         );
@@ -275 +265 @@
                                         'id'       => 'my-account-' . $this->id . '-notifications',
                                         'title'    => __( 'Email', 'buddypress' ),
-                                        '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' ),
-                                                )
-                                        ),
+                                        'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $settings_slug, 'notifications' ) ) ),
                                         'position' => 20,
                                 );
@@ -294 +279 @@
                                         'id'       => 'my-account-' . $this->id . '-data',
                                         'title'    => __( 'Export Data', 'buddypress' ),
-                                        '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' ),
-                                                )
-                                        ),
+                                        'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $settings_slug, 'data' ) ) ),
                                         'position' => 89,
                                 );
@@ -305 +285 @@
 
                         // Delete Account
-                        if ( !bp_current_user_can( 'bp_moderate' ) && ! bp_core_get_root_option( 'bp-disable-account-deletion' ) ) {
+                        if ( ! bp_current_user_can( 'bp_moderate' ) && ! bp_core_get_root_option( 'bp-disable-account-deletion' ) ) {
                                 $wp_admin_nav[] = array(
                                         'parent'   => 'my-account-' . $this->id,
                                         'id'       => 'my-account-' . $this->id . '-delete-account',
                                         'title'    => __( 'Delete Account', 'buddypress' ),
-                                        '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' ),
-                                                )
-                                        ),
+                                        'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $settings_slug, 'delete-account' ) ) ),
                                         'position' => 90,
                                 );