Changeset 13472

Timestamp:

05/07/2023 05:40:25 PM (21 months ago)

Author:

imath

Message:

Use the bp_displayed_user_url() function the right way

Use the bp_members_get_path_chunks() helper function to build the arguments array expected by bp_displayed_user_url() at 8 places where a regular array of slugs were wrongly used during the BP Rewrites merge process (#4954).

Closes ​https://github.com/buddypress/buddypress/pull/98
Fixes #8884

Location:

trunk/src/bp-templates

Files:

• bp-legacy/buddypress/members/single/settings/data.php (modified) (1 diff)
• bp-nouveau/buddypress/members/single/settings/data.php (modified) (1 diff)
• bp-nouveau/includes/groups/functions.php (modified) (1 diff)
• bp-nouveau/includes/template-tags.php (modified) (5 diffs)

trunk/src/bp-templates/bp-legacy/buddypress/members/single/settings/data.php

@@ -85 +85 @@
                 sprintf(
                     '<a href="%1$s">%2$s</a>',
-                    esc_url( bp_displayed_user_url( array( bp_get_settings_slug(), 'delete-account' ) ) ),
+                    esc_url( bp_displayed_user_url( bp_members_get_path_chunks( array( bp_get_settings_slug(), 'delete-account'  ) ) ) ),
                     esc_html__( 'Delete Account', 'buddypress' )
                 )

trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/data.php

@@ -78 +78 @@
                 sprintf(
                     '<a href="%1$s">%2$s</a>',
-                    esc_url( bp_displayed_user_url( array( bp_nouveau_get_component_slug( 'settings' ), 'delete-account' ) ) ),
+                    esc_url( bp_displayed_user_url( bp_members_get_path_chunks( array( bp_nouveau_get_component_slug( 'settings' ), 'delete-account' ) ) ) ),
                     esc_html__( 'Delete Account', 'buddypress' )
                 )

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

@@ -503 +503 @@
         }
 
-        bp_core_redirect( bp_displayed_user_url( array( bp_nouveau_get_component_slug( 'settings' ), 'invites' ) ) );
+        bp_core_redirect( bp_displayed_user_url( bp_members_get_path_chunks( array( bp_nouveau_get_component_slug( 'settings' ), 'invites' ) ) ) );
     }
 

trunk/src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -2714 +2714 @@
 
                 if ( $retval ) {
-                    $bp_nouveau->activity->current_rss_feed['link'] = bp_displayed_user_url( array( bp_nouveau_get_component_slug( 'activity' ), 'feed' ) );
+                    $bp_nouveau->activity->current_rss_feed['link'] = bp_displayed_user_url( bp_members_get_path_chunks( array( bp_nouveau_get_component_slug( 'activity' ), 'feed' ) ) );
                 }
 
@@ -2721 +2721 @@
 
                     if ( $retval ) {
-                        $bp_nouveau->activity->current_rss_feed['link'] = bp_displayed_user_url( array( bp_nouveau_get_component_slug( 'activity' ), bp_nouveau_get_component_slug( 'friends' ), 'feed' ) );
+                        $bp_nouveau->activity->current_rss_feed['link'] = bp_displayed_user_url( bp_members_get_path_chunks( array( bp_nouveau_get_component_slug( 'activity' ), bp_nouveau_get_component_slug( 'friends' ), 'feed' ) ) );
                     }
                 } elseif ( bp_is_active( 'groups' ) && bp_is_current_action( bp_nouveau_get_component_slug( 'groups' ) ) ) {
@@ -2727 +2727 @@
 
                     if ( $retval ) {
-                        $bp_nouveau->activity->current_rss_feed['link'] = bp_displayed_user_url( array( bp_nouveau_get_component_slug( 'activity' ), bp_nouveau_get_component_slug( 'groups' ), 'feed' ) );
+                        $bp_nouveau->activity->current_rss_feed['link'] = bp_displayed_user_url( bp_members_get_path_chunks( array( bp_nouveau_get_component_slug( 'activity' ), bp_nouveau_get_component_slug( 'groups' ), 'feed' ) ) );
                     }
                 } elseif ( bp_activity_do_mentions() && bp_is_current_action( 'mentions' ) ) {
@@ -2733 +2733 @@
 
                     if ( $retval ) {
-                        $bp_nouveau->activity->current_rss_feed['link'] = bp_displayed_user_url( array( bp_nouveau_get_component_slug( 'activity' ), 'mentions', 'feed' ) );
+                        $bp_nouveau->activity->current_rss_feed['link'] = bp_displayed_user_url( bp_members_get_path_chunks( array( bp_nouveau_get_component_slug( 'activity' ), 'mentions', 'feed' ) ) );
                     }
                 } elseif ( bp_activity_can_favorite() && bp_is_current_action( 'favorites' ) ) {
@@ -2739 +2739 @@
 
                     if ( $retval ) {
-                        $bp_nouveau->activity->current_rss_feed['link'] = bp_displayed_user_url( array( bp_nouveau_get_component_slug( 'activity' ), 'favorites', 'feed' ) );
+                        $bp_nouveau->activity->current_rss_feed['link'] = bp_displayed_user_url( bp_members_get_path_chunks( array( bp_nouveau_get_component_slug( 'activity' ), 'favorites', 'feed' ) ) );
                     }
                 }