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

Timestamp:

03/31/2023 05:26:39 PM (3 years ago)

Author:

imath

Message:

Make sure all displayed user URLs are built using the BP Rewrites API

Replace all remaining bp_displayed_user_domain() usage in favor of
bp_displayed_user_url().
Introduce the bp_members_get_path_chunks() function to quickly build BP
Rewrites argument for member's URL using an array of slugs.
Deprecate bp_activities_member_rss_link(), bp_blogs_blog_tabs() &
bp_groups_header_tabs().
Improve bp_displayed_user_link() so that it's possible to pass an array
of slugs to output an escaped BP Rewrites ready URL.

Props r-a-y, johnjamesjacoby, boonebgorges

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

File:

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

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

@@ -83 +83 @@
 
         // Only show if viewing a user.
-        if ( !bp_is_user() )
+        if ( ! bp_is_user() ) {
                 return false;
+        }
 
         // Don't show this menu to non site admins or if you're viewing your own profile.
-        if ( !current_user_can( 'edit_users' ) || bp_is_my_profile() )
+        if ( ! current_user_can( 'edit_users' ) || bp_is_my_profile() ) {
                 return false;
+        }
 
         $bp = buddypress();
@@ -96 +98 @@
 
         // Add the top-level User Admin button.
-        $wp_admin_bar->add_node( array(
-                'id'    => $bp->user_admin_menu_id,
-                'title' => __( 'Edit Member', 'buddypress' ),
-                'href'  => bp_displayed_user_domain()
-        ) );
+        $wp_admin_bar->add_node(
+                array(
+                        'id'    => $bp->user_admin_menu_id,
+                        'title' => __( 'Edit Member', 'buddypress' ),
+                        'href'  => bp_displayed_user_url()
+                )
+        );
 
         if ( bp_is_active( 'xprofile' ) ) {
                 // User Admin > Edit this user's profile.
-                $wp_admin_bar->add_node( array(
-                        'parent' => $bp->user_admin_menu_id,
-                        'id'     => $bp->user_admin_menu_id . '-edit-profile',
-                        'title'  => __( "Edit Profile", 'buddypress' ),
-                        'href'   => bp_get_members_component_link( $bp->profile->id, 'edit' )
-                ) );
+                $wp_admin_bar->add_node(
+                        array(
+                                'parent' => $bp->user_admin_menu_id,
+                                'id'     => $bp->user_admin_menu_id . '-edit-profile',
+                                'title'  => __( "Edit Profile", 'buddypress' ),
+                                'href'   => bp_get_members_component_link( $bp->profile->id, 'edit' ),
+                        )
+                );
 
                 // User Admin > Edit this user's avatar.
                 if ( buddypress()->avatar->show_avatars ) {
-                        $wp_admin_bar->add_node( array(
-                                'parent' => $bp->user_admin_menu_id,
-                                'id'     => $bp->user_admin_menu_id . '-change-avatar',
-                                'title'  => __( "Edit Profile Photo", 'buddypress' ),
-                                'href'   => bp_get_members_component_link( $bp->profile->id, 'change-avatar' )
-                        ) );
+                        $wp_admin_bar->add_node(
+                                array(
+                                        'parent' => $bp->user_admin_menu_id,
+                                        'id'     => $bp->user_admin_menu_id . '-change-avatar',
+                                        'title'  => __( "Edit Profile Photo", 'buddypress' ),
+                                        'href'   => bp_get_members_component_link( $bp->profile->id, 'change-avatar' ),
+                                )
+                        );
                 }
 
                 // User Admin > Edit this user's cover image.
                 if ( bp_displayed_user_use_cover_image_header() ) {
-                        $wp_admin_bar->add_node( array(
-                                'parent' => $bp->user_admin_menu_id,
-                                'id'     => $bp->user_admin_menu_id . '-change-cover-image',
-                                'title'  => __( 'Edit Cover Image', 'buddypress' ),
-                                'href'   => bp_get_members_component_link( $bp->profile->id, 'change-cover-image' )
-                        ) );
+                        $wp_admin_bar->add_node(
+                                array(
+                                        'parent' => $bp->user_admin_menu_id,
+                                        'id'     => $bp->user_admin_menu_id . '-change-cover-image',
+                                        'title'  => __( 'Edit Cover Image', 'buddypress' ),
+                                        'href'   => bp_get_members_component_link( $bp->profile->id, 'change-cover-image' ),
+                                )
+                        );
                 }
 
@@ -135 +145 @@
         if ( bp_is_active( 'settings' ) ) {
                 // User Admin > Spam/unspam.
-                $wp_admin_bar->add_node( array(
-                        'parent' => $bp->user_admin_menu_id,
-                        'id'     => $bp->user_admin_menu_id . '-user-capabilities',
-                        'title'  => __( 'User Capabilities', 'buddypress' ),
-                        'href'   => bp_displayed_user_domain() . 'settings/capabilities/'
-                ) );
+                $wp_admin_bar->add_node(
+                        array(
+                                'parent' => $bp->user_admin_menu_id,
+                                'id'     => $bp->user_admin_menu_id . '-user-capabilities',
+                                'title'  => __( 'User Capabilities', 'buddypress' ),
+                                'href'   => bp_get_members_component_link( $bp->settings->id, 'capabilities' ),
+                        )
+                );
 
                 // User Admin > Delete Account.
-                $wp_admin_bar->add_node( array(
-                        'parent' => $bp->user_admin_menu_id,
-                        'id'     => $bp->user_admin_menu_id . '-delete-user',
-                        'title'  => __( 'Delete Account', 'buddypress' ),
-                        'href'   => bp_displayed_user_domain() . 'settings/delete-account/'
-                ) );
-
-        }
-
+                $wp_admin_bar->add_node(
+                        array(
+                                'parent' => $bp->user_admin_menu_id,
+                                'id'     => $bp->user_admin_menu_id . '-delete-user',
+                                'title'  => __( 'Delete Account', 'buddypress' ),
+                                'href'   => bp_get_members_component_link( $bp->settings->id, 'delete-account' ),
+                        )
+                );
+        }
 }
 add_action( 'admin_bar_menu', 'bp_members_admin_bar_user_admin_menu', 99 );