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

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

@@ -295 +295 @@
         // Menus for logged in user.
         if ( is_user_logged_in() ) {
-
-            // Setup the logged in user variables.
-            $messages_link = trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() );
+            $message_slug        = bp_get_messages_slug();
+            $custom_message_slug = bp_rewrites_get_slug( 'members', 'member_' . $message_slug, $message_slug );
 
             // Unread message count.
@@ -322 +321 @@
                 'id'     => 'my-account-' . $this->id,
                 'title'  => $title,
-                'href'   => $messages_link
+                'href'   => bp_loggedin_user_url(
+                    array(
+                        'single_item_component' => $custom_message_slug,
+                    )
+                ),
             );
 
@@ -330 +333 @@
                 'id'       => 'my-account-' . $this->id . '-inbox',
                 'title'    => $inbox,
-                'href'     => trailingslashit( $messages_link . 'inbox' ),
-                'position' => 10
+                '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' ),
+                    )
+                ),
+                'position' => 10,
             );
 
             // 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'     => trailingslashit( $messages_link . bp_get_messages_starred_slug() ),
-                    'position' => 11
+                    '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 ),
+                        )
+                    ),
+                    'position' => 11,
                 );
             }
@@ -350 +364 @@
                 'id'       => 'my-account-' . $this->id . '-sentbox',
                 'title'    => __( 'Sent', 'buddypress' ),
-                'href'     => trailingslashit( $messages_link . 'sentbox' ),
-                'position' => 20
+                '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' ),
+                    )
+                ),
+                'position' => 20,
             );
 
@@ -359 +378 @@
                 'id'       => 'my-account-' . $this->id . '-compose',
                 'title'    => __( 'Compose', 'buddypress' ),
-                'href'     => trailingslashit( $messages_link . 'compose' ),
-                'position' => 30
+                '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' ),
+                    )
+                ),
+                'position' => 30,
             );
 
@@ -369 +393 @@
                     'id'       => 'my-account-' . $this->id . '-notices',
                     'title'    => __( 'Site Notices', 'buddypress' ),
-                    'href'     => trailingslashit( $messages_link . 'notices' ),
-                    'position' => 90
+                    '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' ),
+                        )
+                    ),
+                    'position' => 90,
                 );
             }