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

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

@@ -616 +616 @@
      */
     public function get_avatar_cover_image_admin_navs( $admin_bar_menu_id = '' ) {
-        $wp_admin_nav = array();
-        $profile_link = trailingslashit( bp_loggedin_user_domain() . bp_get_profile_slug() );
+        $wp_admin_nav        = array();
+        $profile_slug        = bp_get_profile_slug();
+        $custom_profile_slug = bp_rewrites_get_slug( 'members', 'member_' . $profile_slug, $profile_slug );
 
         if ( ! $admin_bar_menu_id ) {
@@ -629 +630 @@
                 'id'       => 'my-account-' . $admin_bar_menu_id . '-change-avatar',
                 'title'    => _x( 'Change Profile Photo', 'My Account Profile sub nav', 'buddypress' ),
-                'href'     => trailingslashit( $profile_link . 'change-avatar' ),
-                'position' => 30
+                'href'     => bp_loggedin_user_url(
+                    array(
+                        'single_item_component' => $custom_profile_slug,
+                        'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $profile_slug . '_change_avatar', 'change-avatar' ),
+                    )
+                ),
+                'position' => 30,
             );
         }
@@ -640 +646 @@
                 'id'       => 'my-account-' . $admin_bar_menu_id . '-change-cover-image',
                 'title'    => _x( 'Change Cover Image', 'My Account Profile sub nav', 'buddypress' ),
-                'href'     => trailingslashit( $profile_link . 'change-cover-image' ),
-                'position' => 40
+                'href'     => bp_loggedin_user_url(
+                    array(
+                        'single_item_component' => $custom_profile_slug,
+                        'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $profile_slug . '_change_cover_image', 'change-cover-image' ),
+                    )
+                ),
+                'position' => 40,
             );
-        }
-
-        return $wp_admin_nav;
-    }
-
-    /**
-     * Get the members invitations admin bar navs.
-     *
-     * @since 8.0.0
-     *
-     * @param  string $admin_bar_menu_id The Admin bar menu ID to attach sub items to.
-     * @return array                     The members invitations admin navs.
-     */
-    public function get_members_invitations_admin_navs( $admin_bar_menu_id = '' ) {
-        $wp_admin_nav = array();
-        $invite_link  = trailingslashit( bp_loggedin_user_domain() . bp_get_profile_slug() );
-
-        if ( ! $admin_bar_menu_id ) {
-            $admin_bar_menu_id = $this->id;
         }
 
@@ -677 +669 @@
         // Menus for logged in user.
         if ( is_user_logged_in() ) {
-            $profile_link = trailingslashit( bp_loggedin_user_domain() . bp_get_profile_slug() );
+            $profile_slug        = bp_get_profile_slug();
+            $custom_profile_slug = bp_rewrites_get_slug( 'members', 'member_' . $profile_slug, $profile_slug );
 
             if ( ! bp_is_active( 'xprofile' ) ) {
@@ -685 +678 @@
                     'id'     => 'my-account-' . $this->id,
                     'title'  => _x( 'Profile', 'My Account Profile', 'buddypress' ),
-                    'href'   => $profile_link
+                    'href'   => bp_loggedin_user_url(
+                        array(
+                            'single_item_component' => $custom_profile_slug,
+                        )
+                    ),
                 );
 
@@ -693 +690 @@
                     'id'       => 'my-account-' . $this->id . '-public',
                     'title'    => _x( 'View', 'My Account Profile sub nav', 'buddypress' ),
-                    'href'     => trailingslashit( $profile_link . 'public' ),
-                    'position' => 10
+                    'href'     => bp_loggedin_user_url(
+                        array(
+                            'single_item_component' => $custom_profile_slug,
+                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $profile_slug . '_public', 'public' ),
+                        )
+                    ),
+                    'position' => 10,
                 );