Changeset 13503 for trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php

Timestamp:

06/18/2023 04:11:04 AM (18 months 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-templates/bp-nouveau/includes/activity/functions.php (modified) (5 diffs)

trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php

@@ -220 +220 @@
             )
         );
-        $activity_slug = bp_nouveau_get_component_slug( 'activity' );
-        $path_chunks   = array(
-            'single_item_component' => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug, $activity_slug ),
-        );
+        $activity_slug    = bp_nouveau_get_component_slug( 'activity' );
 
         // If the user has favorite create a nav item
         if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) {
-            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_favorites', 'favorites' );
-
             $nav_items['favorites'] = array(
                 'component' => 'activity',
                 'slug'      => 'favorites', // slug is used because BP_Core_Nav requires it, but it's the scope
                 'li_class'  => array(),
-                'link'      => bp_loggedin_user_url( $path_chunks ),
+                'link'      => bp_loggedin_user_url( bp_members_get_path_chunks( array( $activity_slug, 'favorites' ) ) ),
                 'text'      => __( 'My Favorites', 'buddypress' ),
                 'count'     => false,
@@ -242 +237 @@
         // The friends component is active and user has friends
         if ( bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) {
-            $friends_slug                      = bp_nouveau_get_component_slug( 'friends' );
-            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_' . $friends_slug, $friends_slug );
-
             $nav_items['friends'] = array(
                 'component' => 'activity',
                 'slug'      => 'friends', // slug is used because BP_Core_Nav requires it, but it's the scope
                 'li_class'  => array( 'dynamic' ),
-                'link'      =>  bp_loggedin_user_url( $path_chunks ),
+                'link'      =>  bp_loggedin_user_url( bp_members_get_path_chunks( array( $activity_slug, bp_nouveau_get_component_slug( 'friends' ) ) ) ),
                 'text'      => __( 'My Friends', 'buddypress' ),
                 'count'     => '',
@@ -258 +250 @@
         // The groups component is active and user has groups
         if ( bp_is_active( 'groups' ) && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) {
-            $groups_slug                       = bp_nouveau_get_component_slug( 'groups' );
-            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_' . $groups_slug, $groups_slug );
-
             $nav_items['groups'] = array(
                 'component' => 'activity',
                 'slug'      => 'groups', // slug is used because BP_Core_Nav requires it, but it's the scope
                 'li_class'  => array( 'dynamic' ),
-                'link'      => bp_loggedin_user_url( $path_chunks ),
+                'link'      => bp_loggedin_user_url( bp_members_get_path_chunks( array( $activity_slug, bp_nouveau_get_component_slug( 'groups' ) ) ) ),
                 'text'      => __( 'My Groups', 'buddypress' ),
                 'count'     => '',
@@ -274 +263 @@
         // Mentions are allowed
         if ( bp_activity_do_mentions() ) {
-            $deprecated_hooks[]                = array( 'bp_before_activity_type_tab_mentions', 'activity', 36 );
-            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_mentions', 'mentions' );
-
-            $count = '';
+            $deprecated_hooks[] = array( 'bp_before_activity_type_tab_mentions', 'activity', 36 );
+            $count              = '';
+
             if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) {
                 $count = bp_get_total_mention_count_for_user( bp_loggedin_user_id() );
@@ -286 +274 @@
                 'slug'      => 'mentions', // slug is used because BP_Core_Nav requires it, but it's the scope
                 'li_class'  => array( 'dynamic' ),
-                'link'      => bp_loggedin_user_url( $path_chunks ),
+                'link'      => bp_loggedin_user_url( bp_members_get_path_chunks( array( $activity_slug, 'mentions' ) ) ),
                 'text'      => __( 'Mentions', 'buddypress' ),
                 'count'     => $count,