Changeset 13441 for trunk/src/bp-members/bp-members-adminbar.php

Timestamp:

03/23/2023 07:35:38 PM (3 years ago)

Author:

imath

Message:

Make BP_Core_Nav generate "BP Rewrites ready" navigation links

• Remove all components $parent_url attributes when setting sub nav items.
• Only use the bp_core_create_nav_link() $link attribute argument & the bp_core_create_subnav_link() $parent_url attribute argument if specified to preserve backward compatibility.
• Migrates the Community search feature so that it uses BP Rewrites.
• Perform some bp_loggedin_user_domain() in favor of bp_loggedin_user_url().
• Update some PHPUnit tests.

Props r-a-y, johnjamesjacoby, boonebgorges

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

File:

• trunk/src/bp-members/bp-members-adminbar.php (modified) (5 diffs)

trunk/src/bp-members/bp-members-adminbar.php

@@ -43 +43 @@
                         'group'  => true,
                         'title'  => __( 'Edit My Profile', 'buddypress' ),
-                        'href'   => bp_loggedin_user_domain(),
+                        'href'   => bp_loggedin_user_url(),
                         'meta'   => array(
                         'class'  => 'ab-sub-secondary'
@@ -201 +201 @@
 
         if ( bp_current_user_can( 'bp_members_invitations_view_screens' ) ) {
-                $bp               = buddypress();
-                $invitations_link = trailingslashit( bp_loggedin_user_domain() . bp_get_members_invitations_slug() );
+                $bp                 = buddypress();
+                $invite_slug        = bp_get_members_invitations_slug();
+                $custom_invite_slug = bp_rewrites_get_slug( 'members', 'member_' . $invite_slug, $invite_slug );
 
                 $wp_admin_bar->add_node(
@@ -209 +210 @@
                                 'parent' => $bp->my_account_menu_id,
                                 'title'  => __( 'Invitations', 'buddypress' ),
-                                'href'   => $invitations_link,
+                                'href'   => bp_loggedin_user_url(
+                                        array(
+                                                'single_item_component' => $custom_invite_slug,
+                                        )
+                                ),
                                 'meta'   => array(
                                         'class'  => 'ab-sub-secondary'
@@ -222 +227 @@
                                         'parent' => $bp->my_account_menu_id . '-invitations',
                                         'title'  => __( 'Send Invites', 'buddypress' ),
-                                        'href'   => $invitations_link . 'send-invites/',
+                                        'href'   => bp_loggedin_user_url(
+                                                array(
+                                                        'single_item_component' => $custom_invite_slug,
+                                                        'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $invite_slug . '_send_invites', 'send-invites' ),
+                                                )
+                                        ),
                                         'meta'   => array(
                                                 'class'  => 'ab-sub-secondary'
@@ -235 +245 @@
                                 'parent' => $bp->my_account_menu_id . '-invitations',
                                 'title'  => __( 'Pending Invites', 'buddypress' ),
-                                'href'   => $invitations_link . 'list-invites/',
+                                'href'   => bp_loggedin_user_url(
+                                        array(
+                                                'single_item_component' => $custom_invite_slug,
+                                                'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $invite_slug . '_list_invites', 'list-invites' ),
+                                        )
+                                ),
                                 'meta'   => array(
                                         'class'  => 'ab-sub-secondary'