Changeset 13443 for trunk/src/bp-activity/bp-activity-template.php

Timestamp:

03/31/2023 05:26:39 PM (19 months 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-activity/bp-activity-template.php (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-template.php

@@ -3909 +3909 @@
  *
  * @since 1.2.0
- *
  */
 function bp_member_activity_feed_link() {
-    echo bp_get_member_activity_feed_link();
-}
-
-/**
- * Output the member activity feed link.
- *
- * @since 1.0.0
- * @deprecated 1.2.0
- *
- * @todo properly deprecate in favor of bp_member_activity_feed_link().
- *
- */
-function bp_activities_member_rss_link() { echo bp_get_member_activity_feed_link(); }
+    echo esc_url( bp_get_member_activity_feed_link() );
+}
 
     /**
@@ -3931 +3919 @@
      * @since 1.2.0
      *
-     *
      * @return string $link The member activity feed link.
      */
     function bp_get_member_activity_feed_link() {
+        $activity_slug = bp_get_activity_slug();
+        $path_chunks   = array(
+            'single_item_component' => bp_rewrites_get_slug( 'members', 'member_' . $activity_slug, $activity_slug ),
+        );
 
         // Single member activity feed link.
         if ( bp_is_profile_component() || bp_is_current_action( 'just-me' ) ) {
-            $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/feed/';
+            $path_chunks['single_item_action'] = 'feed';
+            $link                              = bp_displayed_user_url( $path_chunks );
 
         // Friend feed link.
         } elseif ( bp_is_active( 'friends' ) && bp_is_current_action( bp_get_friends_slug() ) ) {
-            $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/feed/';
+            $friends_slug                                = bp_get_friends_slug();
+            $path_chunks['single_item_action']           = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_' . $friends_slug, $friends_slug );
+            $path_chunks['single_item_action_variables'] = array( 'feed' );
+            $link                                        = bp_displayed_user_url( $path_chunks );
 
         // Group feed link.
         } elseif ( bp_is_active( 'groups'  ) && bp_is_current_action( bp_get_groups_slug()  ) ) {
-            $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/feed/';
+            $groups_slug                                 = bp_get_groups_slug();
+            $path_chunks['single_item_action']           = bp_rewrites_get_slug( 'members', 'member_' . $activity_slug . '_' . $groups_slug, $groups_slug );
+            $path_chunks['single_item_action_variables'] = array( 'feed' );
+            $link                                        = bp_displayed_user_url( $path_chunks );
 
         // Favorites activity feed link.
         } elseif ( 'favorites' === bp_current_action() ) {
-            $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/favorites/feed/';
+            $path_chunks['single_item_action']           = bp_rewrites_get_slug( 'members', 'member_'  . $activity_slug . '_favorites', 'favorites' );
+            $path_chunks['single_item_action_variables'] = array( 'feed' );
+            $link                                        = bp_displayed_user_url( $path_chunks );
 
         // Mentions activity feed link.
         } elseif ( ( 'mentions' === bp_current_action() ) && bp_activity_do_mentions() ) {
-            $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/mentions/feed/';
+            $path_chunks['single_item_action']           = bp_rewrites_get_slug( 'members', 'member_'  . $activity_slug . '_mentions', 'mentions' );
+            $path_chunks['single_item_action_variables'] = array( 'feed' );
+            $link                                        = bp_displayed_user_url( $path_chunks );
 
         // No feed link.