Changeset 13503 for trunk/src/bp-activity/classes/class-bp-activity-component.php

Timestamp:

06/18/2023 04:11:04 AM (2 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-activity/classes/class-bp-activity-component.php (modified) (7 diffs)

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

@@ -336 +336 @@
 
             // Setup the logged in user variables.
-            $activity_slug        = bp_get_activity_slug();
-            $custom_activity_slug = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug, $activity_slug );
+            $activity_slug = bp_get_activity_slug();
 
             // Unread message count.
             if ( bp_activity_do_mentions() ) {
                 $count = bp_get_total_mention_count_for_user( bp_loggedin_user_id() );
-                if ( !empty( $count ) ) {
+                if ( ! empty( $count ) ) {
                     $title = sprintf(
                         /* translators: %s: Unread mention count for the current user */
@@ -358 +357 @@
                 'id'     => 'my-account-' . $this->id,
                 'title'  => _x( 'Activity', 'My Account Activity sub nav', 'buddypress' ),
-                'href'   => bp_loggedin_user_url(
-                    array(
-                        'single_item_component' => $custom_activity_slug,
-                    )
-                ),
+                'href'   => bp_loggedin_user_url( bp_members_get_path_chunks( array( $activity_slug ) ) ),
             );
 
@@ -370 +365 @@
                 'id'       => 'my-account-' . $this->id . '-personal',
                 'title'    => _x( 'Personal', 'My Account Activity sub nav', 'buddypress' ),
-                'href'     => bp_loggedin_user_url(
-                    array(
-                        'single_item_component' => $custom_activity_slug,
-                        'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_just_me', 'just-me' ),
-                    )
-                ),
+                'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $activity_slug, 'just-me' ) ) ),
                 'position' => 10,
             );
@@ -385 +375 @@
                     'id'       => 'my-account-' . $this->id . '-mentions',
                     'title'    => $title,
-                    'href'     => bp_loggedin_user_url(
-                        array(
-                            'single_item_component' => $custom_activity_slug,
-                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_mentions', 'mentions' ),
-                        )
-                    ),
+                    'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $activity_slug, 'mentions' ) ) ),
                     'position' => 20,
                 );
@@ -401 +386 @@
                     'id'       => 'my-account-' . $this->id . '-favorites',
                     'title'    => _x( 'Favorites', 'My Account Activity sub nav', 'buddypress' ),
-                    'href'     => bp_loggedin_user_url(
-                        array(
-                            'single_item_component' => $custom_activity_slug,
-                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_favorites', 'favorites' ),
-                        )
-                    ),
+                    'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $activity_slug, 'favorites' ) ) ),
                     'position' => 30,
                 );
@@ -413 +393 @@
             // Friends?
             if ( bp_is_active( 'friends' ) ) {
-                $friends_slug   = bp_get_friends_slug();
                 $wp_admin_nav[] = array(
                     'parent'   => 'my-account-' . $this->id,
                     'id'       => 'my-account-' . $this->id . '-friends',
                     'title'    => _x( 'Friends', 'My Account Activity sub nav', 'buddypress' ),
-                    'href'     => bp_loggedin_user_url(
-                        array(
-                            'single_item_component' => $custom_activity_slug,
-                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_' . $friends_slug, $friends_slug ),
-                        )
-                    ),
+                    'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $activity_slug, bp_get_friends_slug() ) ) ),
                     'position' => 40,
                 );
@@ -430 +404 @@
             // Groups?
             if ( bp_is_active( 'groups' ) ) {
-                $groups_slug    = bp_get_groups_slug();
                 $wp_admin_nav[] = array(
                     'parent'   => 'my-account-' . $this->id,
                     'id'       => 'my-account-' . $this->id . '-groups',
                     'title'    => _x( 'Groups', 'My Account Activity sub nav', 'buddypress' ),
-                    'href'     => bp_loggedin_user_url(
-                        array(
-                            'single_item_component' => $custom_activity_slug,
-                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_' . $groups_slug, $groups_slug ),
-                        )
-                    ),
+                    'href'     => bp_loggedin_user_url( bp_members_get_path_chunks( array( $activity_slug, bp_get_groups_slug() ) ) ),
                     'position' => 50
                 );