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

Timestamp:

03/31/2023 05:26:39 PM (18 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-members/bp-members-template.php (modified) (5 diffs)

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

@@ -1876 +1876 @@
  *
  * @since 1.2.4
- */
-function bp_displayed_user_link() {
-    echo esc_url( bp_displayed_user_url() );
+ * @since 12.0.0 Introduced the `$chunk` argument.
+ *
+ * @param array $chunk A list of slugs to append to the URL.
+ */
+function bp_displayed_user_link( $chunks = array() ) {
+    $path_chunks = array();
+    $chunks      = (array) $chunks;
+
+    if ( $chunks ) {
+        $path_chunks = bp_members_get_path_chunks( $chunks );
+    }
+
+    echo esc_url( bp_displayed_user_url( $path_chunks ) );
 }
 
@@ -1962 +1972 @@
 
     if ( $chunks ) {
-        $single_item_component = array_shift( $chunks );
-        if ( $single_item_component ) {
-            $path_chunks['single_item_component'] = bp_rewrites_get_slug( 'members', 'member_' . $single_item_component, $single_item_component );
-        }
-
-        $single_item_action = array_shift( $chunks );
-        if ( $single_item_action ) {
-            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', 'member_' . $single_item_component . '_' . $single_item_action, $single_item_action );
-        }
-
-        if ( $chunks ) {
-            foreach ( $chunks as $chunk ) {
-                $path_chunks['single_item_action_variables'][] = bp_rewrites_get_slug( 'members', 'member_' . $single_item_component . '_' . $single_item_action . '_' . $chunk, $chunk );
-            }
-        }
+        $path_chunks = bp_members_get_path_chunks( $chunks );
     }
 
@@ -3098 +3094 @@
         }
 
+        $path_chunks = array(
+            'single_item_component' => $bp->{$component}->slug,
+        );
+
         // Append $action to $url if there is no $type.
         if ( ! empty( $action ) ) {
-            $url = bp_displayed_user_domain() . $bp->{$component}->slug . '/' . $action;
-        } else {
-            $url = bp_displayed_user_domain() . $bp->{$component}->slug;
+            $action_rewrite_id                 = 'member_' . str_replace( '-', '_', $action );
+            $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'members', $action_rewrite_id, $action );
         }
 
         // Add a slash at the end of our user url.
-        $url = trailingslashit( $url );
+        $url = bp_displayed_user_url( $path_chunks );
 
         // Add possible query arg.
@@ -3145 +3144 @@
      */
     function bp_get_avatar_delete_link() {
+        $profile_slug = bp_get_profile_slug();
+        $url          = wp_nonce_url(
+            bp_displayed_user_url(
+                array(
+                    'single_item_component'        => bp_rewrites_get_slug( 'members', 'member_' . $profile_slug, $profile_slug ),
+                    'single_item_action'           => bp_rewrites_get_slug( 'members', 'member_' . $profile_slug . '_change_avatar', 'change-avatar' ),
+                    'single_item_action_variables' => array( bp_rewrites_get_slug( 'members', 'member_' . $profile_slug . '_delete_avatar', 'delete-avatar' ) ),
+                )
+            ),
+            'bp_delete_avatar_link'
+        );
 
         /**
@@ -3151 +3161 @@
          * @since 1.1.0
          *
-         * @param string $value Nonced URL used for deleting an avatar.
-         */
-        return apply_filters( 'bp_get_avatar_delete_link', wp_nonce_url( bp_displayed_user_domain() . bp_get_profile_slug() . '/change-avatar/delete-avatar/', 'bp_delete_avatar_link' ) );
+         * @param string $url Nonced URL used for deleting an avatar.
+         */
+        return apply_filters( 'bp_get_avatar_delete_link', $url );
     }