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

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

@@ -310 +310 @@
                 // Menus for logged in user.
                 if ( is_user_logged_in() ) {
-                        $message_slug        = bp_get_messages_slug();
-                        $custom_message_slug = bp_rewrites_get_slug( 'members', 'member_' . $message_slug, $message_slug );
+                        $message_slug = bp_get_messages_slug();
 
                         // Unread message count.
@@ -336 +335 @@
                                 'id'     => 'my-account-' . $this->id,
                                 'title'  => $title,
-                                'href'   => bp_loggedin_user_url(
-                                        array(
-                                                'single_item_component' => $custom_message_slug,
-                                        )
-                                ),
+                                'href'   => bp_loggedin_user_url( bp_members_get_path_chunks( array( $message_slug ) ) ),
                         );
 
@@ -348 +343 @@
                                 'id'       => 'my-account-' . $this->id . '-inbox',
                                 'title'    => $inbox,
-                                'href'     => bp_loggedin_user_url(
-                                        array(
-                                                'single_item_component' => $custom_message_slug,
-                                                'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $message_slug . '_inbox', 'inbox' ),
-                                        )
-                                ),
+                                'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $message_slug, 'inbox' ) ) ),
                                 'position' => 10,
                         );
@@ -359 +349 @@
                         // Starred.
                         if ( bp_is_active( $this->id, 'star' ) ) {
-                                $star_slug      = bp_get_messages_starred_slug();
                                 $wp_admin_nav[] = array(
                                         'parent'   => 'my-account-' . $this->id,
                                         'id'       => 'my-account-' . $this->id . '-starred',
                                         'title'    => __( 'Starred', 'buddypress' ),
-                                        'href'     => bp_loggedin_user_url(
-                                                array(
-                                                        'single_item_component' => $custom_message_slug,
-                                                        'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $message_slug . '_' . $star_slug, $star_slug ),
-                                                )
-                                        ),
+                                        'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $message_slug, bp_get_messages_starred_slug() ) ) ),
                                         'position' => 11,
                                 );
@@ -379 +363 @@
                                 'id'       => 'my-account-' . $this->id . '-sentbox',
                                 'title'    => __( 'Sent', 'buddypress' ),
-                                'href'     => bp_loggedin_user_url(
-                                        array(
-                                                'single_item_component' => $custom_message_slug,
-                                                'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $message_slug . '_sentbox', 'sentbox' ),
-                                        )
-                                ),
+                                'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $message_slug, 'sentbox' ) ) ),
                                 'position' => 20,
                         );
@@ -393 +372 @@
                                 'id'       => 'my-account-' . $this->id . '-compose',
                                 'title'    => __( 'Compose', 'buddypress' ),
-                                'href'     => bp_loggedin_user_url(
-                                        array(
-                                                'single_item_component' => $custom_message_slug,
-                                                'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $message_slug . '_compose', 'compose' ),
-                                        )
-                                ),
+                                'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $message_slug, 'compose' ) ) ),
                                 'position' => 30,
                         );
@@ -408 +382 @@
                                         'id'       => 'my-account-' . $this->id . '-notices',
                                         'title'    => __( 'Site Notices', 'buddypress' ),
-                                        'href'     => bp_loggedin_user_url(
-                                                array(
-                                                        'single_item_component' => $custom_message_slug,
-                                                        'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $message_slug . '_notices', 'notices' ),
-                                                )
-                                        ),
+                                        'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $message_slug, 'notices' ) ) ),
                                         'position' => 90,
                                 );