Changeset 13446

Timestamp:

04/04/2023 01:06:03 AM (19 months ago)

Author:

imath

Message:

Use the BP Rewrites API to generate single Groups item links

• Introduce the bp_groups_get_path_chunks() function to build BP Rewrites arguments using a regular array.
• Improve bp_members_get_path_chunks() so that it avoids looking for a custom slug when the chunk is a numeric value.
• Introduce the bp_get_group_manage_url() function to build Group's front-end Admin URLs using BP Rewrites.
• Deprecate bp_group_admin_permalink() & bp_get_group_admin_permalink() in favor of bp_group_manage_url() & bp_get_group_manage_url().
• Replace all remaining usage of bp_get_group_permalink() in favor of bp_get_group_url() or bp_get_group_manage_url().

Props r-a-y, johnjamesjacoby, boonebgorges

Closes ​https://github.com/buddypress/buddypress/pull/81
See #4954

Location:

trunk/src

Files:

• bp-activity/screens/permalink.php (modified) (1 diff)
• bp-core/deprecated/12.0.php (modified) (1 diff)
• bp-groups/actions/access.php (modified) (1 diff)
• bp-groups/bp-groups-functions.php (modified) (2 diffs)
• bp-groups/bp-groups-notifications.php (modified) (2 diffs)
• bp-groups/bp-groups-template.php (modified) (41 diffs)
• bp-groups/classes/class-bp-group-extension.php (modified) (1 diff)
• bp-groups/classes/class-bp-groups-group-members-template.php (modified) (1 diff)
• bp-groups/screens/single/admin.php (modified) (1 diff)
• bp-groups/screens/single/admin/edit-details.php (modified) (1 diff)
• bp-groups/screens/single/admin/group-settings.php (modified) (1 diff)
• bp-groups/screens/single/admin/manage-members.php (modified) (11 diffs)
• bp-groups/screens/single/admin/membership-requests.php (modified) (1 diff)
• bp-members/bp-members-functions.php (modified) (2 diffs)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (4 diffs)

trunk/src/bp-activity/screens/permalink.php

@@ -56 +56 @@
             // Set redirect to group activity stream.
             if ( $group = groups_get_group( $activity->item_id ) ) {
-                $redirect = bp_get_group_permalink( $group ) . bp_get_activity_slug() . '/' . $activity->id . '/';
+                $path_chunks = bp_groups_get_path_chunks( array( bp_get_activity_slug(), $activity->id ) );
+                $redirect    = bp_get_group_url( $group, $path_chunks );
             }
         }

trunk/src/bp-core/deprecated/12.0.php

@@ -297 +297 @@
     _deprecated_function( __FUNCTION__, '12.0.0', 'bp_displayed_user_url()' );
     bp_displayed_user_url();
+}
+
+/**
+ * Output the permalink for the group.
+ *
+ * @since 1.0.0
+ * @deprecated 12.0.0
+ *
+ * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
+ *                                                Default: false.
+ */
+function bp_group_permalink( $group = false ) {
+    _deprecated_function( __FUNCTION__, '12.0.0', 'bp_group_url' );
+    bp_group_url( $group );
+}
+/**
+ * Return the permalink for the group.
+ *
+ * @since 1.0.0
+ * @since 10.0.0 Updated to use `bp_get_group`.
+ * @deprecated 12.0.0
+ *
+ * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
+ *                                                Default: false.
+ * @return string
+ */
+function bp_get_group_permalink( $group = false ) {
+    $url = bp_get_group_url( $group );
+
+    /**
+     * Filters the permalink for the group.
+     *
+     * @since 1.0.0
+     * @since 2.5.0 Added the `$group` parameter.
+     * @deprecated 12.0.0
+     *
+     * @param string          $url   Permalink for the group.
+     * @param BP_Groups_Group $group The group object.
+     */
+    return apply_filters_deprecated( 'bp_get_group_permalink', array( $url, $group ), '12.0.0', 'bp_get_group_url' );
+}
+
+/**
+ * Output the permalink for the admin section of the group.
+ *
+ * @since 1.0.0
+ * @deprecated 12.0.0
+ *
+ * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
+ *                                                Default: false.
+ */
+function bp_group_admin_permalink( $group = false ) {
+    _deprecated_function( __FUNCTION__, '12.0.0', 'bp_group_manage_url' );
+    bp_group_manage_url( $group );
+}
+
+/**
+ * Return the permalink for the admin section of the group.
+ *
+ * @since 1.0.0
+ * @since 10.0.0 Updated to use `bp_get_group`.
+ * @deprecated 12.0.0
+ *
+ * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
+ *                                                Default: false.
+ * @return string
+ */
+function bp_get_group_admin_permalink( $group = false ) {
+    _deprecated_function( __FUNCTION__, '12.0.0', 'bp_get_group_manage_url' );
+    $permalink = bp_get_group_manage_url( $group );
+
+    /**
+     * Filters the permalink for the admin section of the group.
+     *
+     * @since 1.0.0
+     * @since 2.5.0 Added the `$group` parameter.
+     * @deprecated 12.0.0
+     *
+     * @param string          $permalink Permalink for the admin section of the group.
+     * @param BP_Groups_Group $group     The group object.
+     */
+    return apply_filters_deprecated( 'bp_get_group_admin_permalink', array( $permalink, $group ), '12.0.0', 'bp_get_group_manage_url' );
 }
 

trunk/src/bp-groups/actions/access.php

@@ -33 +33 @@
             $no_access_args = array(
                 'message'  => __( 'You do not have access to this group.', 'buddypress' ),
-                'root'     => bp_get_group_permalink( $current_group ) . 'home/',
+                'root'     => bp_get_group_url(
+                    $current_group,
+                    bp_groups_get_path_chunks( array( 'home' ) )
+                ),
                 'redirect' => false
             );

trunk/src/bp-groups/bp-groups-functions.php

@@ -3836 +3836 @@
                 'position'        => 10,
                 'item_css_id'     => 'home',
+            ),
+            'activity'            => array(
+                'rewrite_id'      => 'bp_group_read_activity',
+                'slug'            => 'activity',
+                'name'            => _x( 'Activity', 'Group read screen', 'buddypress' ),
+                'screen_function' => 'groups_screen_group_activity',
+                'position'        => 11,
+                'user_has_access' => false,
+                'no_access_url'   => '',
+                'item_css_id'     => 'activity',
             ),
             'request-membership' => array(
@@ -3980 +3990 @@
     return $context_screens;
 }
+
+/**
+ * Get single group's path chunks using an array of URL slugs.
+ *
+ * @since 12.0.0
+ *
+ * @param array $chunks An array of URL slugs.
+ * @return array An array of BP Rewrites URL arguments.
+ */
+function bp_groups_get_path_chunks( $chunks = array(), $context = 'read' ) {
+    $path_chunks   = array();
+    $group_screens = bp_get_group_screens( $context );
+
+    if ( 'read' === $context ) {
+        $single_item_action = array_shift( $chunks );
+        if ( $single_item_action ) {
+            if ( isset( $group_screens[ $single_item_action ]['rewrite_id'] ) ) {
+                $item_action_rewrite_id            = $group_screens[ $single_item_action ]['rewrite_id'];
+                $path_chunks['single_item_action'] = bp_rewrites_get_slug( 'groups', $item_action_rewrite_id, $single_item_action );
+            } else {
+                $path_chunks['single_item_action'] = $single_item_action;
+            }
+        }
+    }
+
+    if ( $chunks ) {
+        foreach ( $chunks as $chunk ) {
+            if ( is_numeric( $chunk ) ) {
+                $path_chunks['single_item_action_variables'][] = $chunk;
+            } else {
+                if ( isset( $group_screens[ $chunk ]['rewrite_id'] ) ) {
+                    $item_action_variable_rewrite_id               = $group_screens[ $chunk ]['rewrite_id'];
+                    $path_chunks['single_item_action_variables'][] = bp_rewrites_get_slug( 'groups', $item_action_variable_rewrite_id, $chunk );
+                } else {
+                    $path_chunks['single_item_action_variables'][] = $chunk;
+                }
+            }
+        }
+    }
+
+    return $path_chunks;
+}

trunk/src/bp-groups/bp-groups-notifications.php

@@ -161 +161 @@
     }
 
-    $group = groups_get_group( $group_id );
-    $args  = array(
+    $group       = groups_get_group( $group_id );
+    $path_chunks = bp_groups_get_path_chunks( array( 'membership-requests' ), 'manage' );
+    $args        = array(
         'tokens' => array(
             'admin.id'             => $admin_id,
@@ -168 +169 @@
             'group.name'           => $group->name,
             'group.id'             => $group_id,
-            'group-requests.url'   => esc_url( bp_get_group_permalink( $group ) . 'admin/membership-requests' ),
+            'group-requests.url'   => esc_url( bp_get_group_manage_url( $group, $path_chunks ) ),
             'profile.url'          => esc_url( bp_members_get_user_url( $requesting_user_id ) ),
             'requesting-user.id'   => $requesting_user_id,

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

@@ -1243 +1243 @@
  * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
  *                                                Default: false.
- */
-function bp_group_url( $group = false ) {
-    echo esc_url( bp_get_group_url( $group ) );
+ * @param array                            $chunk (Optional) A list of slugs to append to the URL.
+ */
+function bp_group_url( $group = false, $chunks = array() ) {
+    $path_chunks = array();
+    $chunks      = (array) $chunks;
+
+    if ( $chunks ) {
+        $path_chunks = bp_groups_get_path_chunks( $chunks );
+    }
+
+    echo esc_url( bp_get_group_url( $group, $path_chunks ) );
 }
 
@@ -1257 +1265 @@
  *     An array of arguments. Optional.
  *
- *     @type string $single_item_component        The component slug the action is relative to.
  *     @type string $single_item_action           The slug of the action to perform.
  *     @type array  $single_item_action_variables An array of additional informations about the action to perform.
@@ -1306 +1313 @@
 
 /**
- * Output the permalink for the group.
- *
- * @since 1.0.0
- * @deprecated 12.0.0
- *
- * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
- *                                                Default: false.
- */
-function bp_group_permalink( $group = false ) {
-    _deprecated_function( __FUNCTION__, '12.0.0', 'bp_group_url' );
-    bp_group_url( $group );
-}
-    /**
-     * Return the permalink for the group.
-     *
-     * @since 1.0.0
-     * @since 10.0.0 Updated to use `bp_get_group`.
-     *
-     * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
-     *                                                Default: false.
-     * @return string
-     */
-    function bp_get_group_permalink( $group = false ) {
-        /*
-         * This function is used at many places and we need to review all this
-         * places during the 12.0 development cycle. Using BP Rewrites means we
-         * cannot concatenate URL chunks to build our URL anymore. We now need
-         * to use `bp_get_group_url( $group, $array )` and make sure to use
-         * the right arguments inside this `$array`.
-         *
-         * @todo Once every link reviewed, we'll be able to remove this check
-         *       and let PHPUnit tell us the one we forgot, eventually!
-         */
-        if ( ! buddypress()->is_phpunit_running ) {
-            _deprecated_function( __FUNCTION__, '12.0.0', 'bp_get_group_url' );
-        }
-
-        $url = bp_get_group_url( $group );
-
-        /**
-         * Filters the permalink for the group.
-         *
-         * @since 1.0.0
-         * @since 2.5.0 Added the `$group` parameter.
-         * @deprecated 12.0.0
-         *
-         * @param string          $url   Permalink for the group.
-         * @param BP_Groups_Group $group The group object.
-         */
-        return apply_filters_deprecated( 'bp_get_group_permalink', array( $url, $group ), '12.0.0', 'bp_get_group_url' );
-    }
-
-/**
  * Output an HTML-formatted link for the group.
  *
@@ -1405 +1359 @@
 
 /**
- * Output the permalink for the admin section of the group.
- *
- * @since 1.0.0
+ * Outputs the requested group's manage URL.
+ *
+ * @since 12.0.0
  *
  * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
- *                                                Default: false.
- */
-function bp_group_admin_permalink( $group = false ) {
-    echo bp_get_group_admin_permalink( $group );
-}
-    /**
-     * Return the permalink for the admin section of the group.
-     *
-     * @since 1.0.0
-     * @since 10.0.0 Updated to use `bp_get_group`.
-     *
-     * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
-     *                                                Default: false.
-     * @return string
-     */
-    function bp_get_group_admin_permalink( $group = false ) {
-        $group = bp_get_group( $group );
-
-        if ( empty( $group->id ) ) {
-            return '';
-        }
-
-        /**
-         * Filters the permalink for the admin section of the group.
-         *
-         * @since 1.0.0
-         * @since 2.5.0 Added the `$group` parameter.
-         *
-         * @param string          $permalink Permalink for the admin section of the group.
-         * @param BP_Groups_Group $group     The group object.
-         */
-        return apply_filters( 'bp_get_group_admin_permalink', trailingslashit( bp_get_group_permalink( $group ) . 'admin' ), $group );
-    }
+ *                                                 Default: false.
+ * @param array                            $chunks (Optional) A list of slugs to append to the URL.
+ */
+function bp_group_manage_url( $group = false, $chunks = array() ) {
+    $path_chunks = array();
+    $chunks      = (array) $chunks;
+
+    if ( $chunks ) {
+        $path_chunks = bp_groups_get_path_chunks( $chunks, 'manage' );
+    }
+
+    echo esc_url( bp_get_group_manage_url( $group, $path_chunks ) );
+}
+
+/**
+ * Gets the requested group's manage URL.
+ *
+ * @since 12.0.0
+ *
+ * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
+ *                                                 Default: false.
+ * @param array                            $path_chunks {
+ *     An array of arguments. Optional.
+ *
+ *     @type array  $single_item_action_variables An array of additional informations about the action to perform.
+ * }
+ * @return string The requested group's manage URL.
+ */
+function bp_get_group_manage_url( $group = false, $path_chunks = array() ) {
+    $group = bp_get_group( $group );
+    $url   = '';
+
+    if ( empty( $group->id ) ) {
+        return $url;
+    }
+
+    $admin_chunks = array(
+        'single_item_action' => bp_rewrites_get_slug( 'groups', 'bp_group_read_admin', 'admin' ),
+    );
+
+    if ( isset( $path_chunks['single_item_action_variables'] ) ) {
+        $admin_chunks['single_item_action_variables'] = (array) $path_chunks['single_item_action_variables'];
+    }
+
+    $url = bp_get_group_url( $group, $admin_chunks );
+
+    /**
+     * Filters the group's manage URL.
+     *
+     * @since 12.0.0
+     *
+     * @param string          $url         Permalink for the admin section of the group.
+     * @param BP_Groups_Group $group       The group object.
+     * @param array           $path_chunks BP Rewrites path chunks.
+     */
+    return apply_filters( 'bp_get_group_manage_url', $url, $group, $path_chunks );
+}
 
 /**
@@ -2125 +2103 @@
  * @since 10.0.0 Added the `$group` parameter.
  *
+ * @todo Deprecate: this function is not used inside the codebase.
+ *
  * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
  *                                                Default: false.
  */
 function bp_group_all_members_permalink( $group = false ) {
-    echo bp_get_group_all_members_permalink( $group );
+    echo esc_url( bp_get_group_all_members_permalink( $group ) );
 }
     /**
@@ -2136 +2116 @@
      * @since 1.0.0
      * @since 10.0.0 Updated to use `bp_get_group`.
+     *
+     * @todo Deprecate: this function is not used inside the codebase.
      *
      * @param false|int|string|BP_Groups_Group $group (Optional) The Group ID, the Group Slug or the Group object.
@@ -2142 +2124 @@
      */
     function bp_get_group_all_members_permalink( $group = false ) {
-        $group = bp_get_group( $group );
-
-        if ( empty( $group->id ) ) {
-            return '';
-        }
+        $path_chunks = bp_groups_get_path_chunks( array( 'members' ) );
+        $url         = bp_get_group_url( $group, $path_chunks );
 
         /**
@@ -2154 +2133 @@
          * @since 2.5.0 Added the `$group` parameter.
          *
-         * @param string          $value Permalink of the Members page for a group.
+         * @param string          $url   Permalink of the Members page for a group.
          * @param BP_Groups_Group $group The group object.
          */
-        return apply_filters( 'bp_get_group_all_members_permalink', trailingslashit( bp_get_group_permalink( $group ) . 'members' ), $group );
+        return apply_filters( 'bp_get_group_all_members_permalink', $url, $group );
     }
 
@@ -2415 +2394 @@
  */
 function bp_group_forum_permalink( $group = false ) {
-    echo bp_get_group_forum_permalink( $group );
+    echo esc_url( bp_get_group_forum_permalink( $group ) );
 }
     /**
@@ -2428 +2407 @@
      */
     function bp_get_group_forum_permalink( $group = false ) {
-        $group = bp_get_group( $group );
-
-        if ( empty( $group->id ) ) {
-            return '';
-        }
+        $path_chunks = bp_groups_get_path_chunks( array( 'forum' ) );
+        $url         = bp_get_group_url( $group, $path_chunks );
 
         /**
@@ -2443 +2419 @@
          * @param BP_Groups_Group $group The group object.
          */
-        return apply_filters( 'bp_get_group_forum_permalink', trailingslashit( bp_get_group_permalink( $group ) . 'forum' ), $group );
+        return apply_filters( 'bp_get_group_forum_permalink', $url, $group );
     }
 
@@ -2888 +2864 @@
         );
 
-        extract( $r, EXTR_SKIP );
+        $url = wp_nonce_url(
+            bp_get_group_manage_url(
+                $r['group'],
+                bp_groups_get_path_chunks( array( 'manage-members', 'promote', 'mod', $r['user_id'] ), 'manage' )
+            ),
+            'groups_promote_member'
+        );
 
         /**
@@ -2895 +2877 @@
          * @since 1.1.0
          *
-         * @param string $value URL to use for promoting a user to moderator.
-         */
-        return apply_filters( 'bp_get_group_member_promote_mod_link', wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'admin/manage-members/promote/mod/' . $user_id ), 'groups_promote_member' ) );
+         * @param string $url URL to use for promoting a user to moderator.
+         */
+        return apply_filters( 'bp_get_group_member_promote_mod_link', $url );
     }
 
@@ -2934 +2916 @@
         );
 
-        extract( $r, EXTR_SKIP );
+        $url = wp_nonce_url(
+            bp_get_group_manage_url(
+                $r['group'],
+                bp_groups_get_path_chunks( array( 'manage-members', 'promote', 'admin', $r['user_id'] ), 'manage' )
+            ),
+            'groups_promote_member'
+        );
 
         /**
@@ -2941 +2929 @@
          * @since 1.1.0
          *
-         * @param string $value URL to use for promoting a user to admin.
-         */
-        return apply_filters( 'bp_get_group_member_promote_admin_link', wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'admin/manage-members/promote/admin/' . $user_id ), 'groups_promote_member' ) );
+         * @param string $url URL to use for promoting a user to admin.
+         */
+        return apply_filters( 'bp_get_group_member_promote_admin_link', $url );
     }
 
@@ -2973 +2961 @@
         global $members_template;
 
-        $group = bp_get_group( $group );
-
-        if ( empty( $group->id ) ) {
-            return '';
-        }
-
         if ( ! $user_id ) {
             $user_id = $members_template->member->user_id;
         }
+
+        $url = wp_nonce_url(
+            bp_get_group_manage_url(
+                $group,
+                bp_groups_get_path_chunks( array( 'manage-members', 'demote', $user_id ), 'manage' )
+            ),
+            'groups_demote_member'
+        );
 
         /**
@@ -2990 +2980 @@
          * @since 10.0.0 Added the `$user_id` parameter.
          *
-         * @param string          $value   URL to use for demoting a user to member.
+         * @param string          $url     URL to use for demoting a user to member.
          * @param BP_Groups_Group $group   The group object.
          * @param int             $user_id The user ID.
          */
-        return apply_filters(
-            'bp_get_group_member_demote_link',
-            wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'admin/manage-members/demote/' . $user_id ), 'groups_demote_member' ),
-            $group,
-            $user_id
-        );
+        return apply_filters( 'bp_get_group_member_demote_link', $url, $group, $user_id );
     }
 
@@ -3029 +3014 @@
         global $members_template;
 
-        $group = bp_get_group( $group );
-
-        if ( empty( $group->id ) ) {
-            return '';
-        }
-
         if ( ! $user_id ) {
             $user_id = $members_template->member->user_id;
         }
+
+        $url = wp_nonce_url(
+            bp_get_group_manage_url(
+                $group,
+                bp_groups_get_path_chunks( array( 'manage-members', 'ban', $user_id ), 'manage' )
+            ),
+            'groups_ban_member'
+        );
 
         /**
@@ -3049 +3036 @@
          * @param int             $user_id The user ID.
          */
-        return apply_filters(
-            'bp_get_group_member_ban_link',
-            wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'admin/manage-members/ban/' . $user_id ), 'groups_ban_member' ),
-            $group,
-            $user_id
-        );
+        return apply_filters( 'bp_get_group_member_ban_link', $url, $group, $user_id );
     }
 
@@ -3084 +3066 @@
         global $members_template;
 
-        $group = bp_get_group( $group );
-
-        if ( empty( $group->id ) ) {
-            return '';
-        }
-
         if ( ! $user_id ) {
             $user_id = $members_template->member->user_id;
         }
+
+        $url = wp_nonce_url(
+            bp_get_group_manage_url(
+                $group,
+                bp_groups_get_path_chunks( array( 'manage-members', 'unban', $user_id ), 'manage' )
+            ),
+            'groups_unban_member'
+        );
 
         /**
@@ -3104 +3088 @@
          * @param int             $user_id The user ID.
          */
-        return apply_filters(
-            'bp_get_group_member_unban_link',
-            wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'admin/manage-members/unban/' . $user_id ), 'groups_unban_member' ),
-            $group,
-            $user_id
-        );
+        return apply_filters( 'bp_get_group_member_unban_link', $url,   $group, $user_id );
     }
 
@@ -3139 +3118 @@
         global $members_template;
 
-        $group = bp_get_group( $group );
-
-        if ( empty( $group->id ) ) {
-            return '';
-        }
-
         if ( ! $user_id ) {
             $user_id = $members_template->member->user_id;
         }
+
+        $url = wp_nonce_url(
+            bp_get_group_manage_url(
+                $group,
+                bp_groups_get_path_chunks( array( 'manage-members', 'remove', $user_id ), 'manage' )
+            ),
+            'groups_remove_member'
+        );
 
         /**
@@ -3156 +3137 @@
          * @since 10.0.0 Added the `$user_id` parameter.
          *
-         * @param string          $value   URL to use for removing a member.
+         * @param string          $url     URL to use for removing a member.
          * @param BP_Groups_Group $group   The group object.
          * @param int             $user_id The user ID.
          */
-        return apply_filters(
-            'bp_get_group_member_remove_link',
-            wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'admin/manage-members/remove/' . $user_id ), 'groups_remove_member' ),
-            $group,
-            $user_id
-        );
+        return apply_filters( 'bp_get_group_member_remove_link', $url, $group, $user_id );
     }
 
@@ -3647 +3623 @@
         }
 
+        $url = wp_nonce_url(
+            bp_get_group_url(
+                $group,
+                bp_groups_get_path_chunks( array( 'leave-group', 'yes' ) )
+            ),
+            'groups_leave_group'
+        );
+
         /**
          * Filters the URL for confirming a request to leave a group.
@@ -3653 +3637 @@
          * @since 2.5.0 Added the `$group` parameter.
          *
-         * @param string $value URL for confirming a request to leave a group.
+         * @param string $url   URL for confirming a request to leave a group.
          * @param object $group Group object.
          */
-        return apply_filters( 'bp_group_leave_confirm_link', wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'leave-group/yes' ), 'groups_leave_group' ), $group );
+        return apply_filters( 'bp_group_leave_confirm_link', $url, $group );
     }
 
@@ -3719 +3703 @@
         }
 
+        $url = bp_get_group_url(
+            $group,
+            bp_groups_get_path_chunks( array( 'send-invites', 'send' ) )
+        );
+
         /**
          * Filters the 'action' attribute for a group send invite form.
@@ -3728 +3717 @@
          * @param object $group Group object.
          */
-        return apply_filters( 'bp_group_send_invite_form_action', trailingslashit( bp_get_group_permalink( $group ) . 'send-invites/send' ), $group );
+        return apply_filters( 'bp_group_send_invite_form_action', $url, $group );
     }
 
@@ -3802 +3791 @@
                 return $button_args;
             }
+
+            $url = wp_nonce_url(
+                bp_get_group_url(
+                    $group,
+                    bp_groups_get_path_chunks( array( 'leave-group' ) )
+                ),
+                'groups_leave_group'
+            );
 
             // Setup button attributes.
@@ -3811 +3808 @@
                 'wrapper_class'     => 'group-button ' . $group->status,
                 'wrapper_id'        => 'groupbutton-' . $group->id,
-                'link_href'         => wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'leave-group' ), 'groups_leave_group' ),
+                'link_href'         => $url,
                 'link_text'         => __( 'Leave Group', 'buddypress' ),
                 'link_title'        => __( 'Leave Group', 'buddypress' ),
@@ -3826 +3823 @@
 
                 case 'public':
+                    $url = wp_nonce_url(
+                        bp_get_group_url(
+                            $group,
+                            bp_groups_get_path_chunks( array( 'join' ) )
+                        ),
+                        'groups_join_group'
+                    );
+
                     $button_args = array(
                         'id'                => 'join_group',
@@ -3833 +3838 @@
                         'wrapper_class'     => 'group-button ' . $group->status,
                         'wrapper_id'        => 'groupbutton-' . $group->id,
-                        'link_href'         => wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'join' ), 'groups_join_group' ),
+                        'link_href'         => $url,
                         'link_text'         => __( 'Join Group', 'buddypress' ),
                         'link_title'        => __( 'Join Group', 'buddypress' ),
@@ -3877 +3882 @@
                     // show a "Request Membership" button.
                     } else {
+                        $url = wp_nonce_url(
+                            bp_get_group_url(
+                                $group,
+                                bp_groups_get_path_chunks( array( 'request-membership' ) )
+                            ),
+                            'groups_request_membership'
+                        );
+
                         $button_args = array(
                             'id'                => 'request_membership',
@@ -3884 +3897 @@
                             'wrapper_class'     => 'group-button ' . $group->status,
                             'wrapper_id'        => 'groupbutton-' . $group->id,
-                            'link_href'         => wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'request-membership' ), 'groups_request_membership' ),
+                            'link_href'         => $url,
                             'link_text'         => __( 'Request Membership', 'buddypress' ),
                             'link_title'        => __( 'Request Membership', 'buddypress' ),
@@ -5939 +5952 @@
      */
     function bp_get_group_avatar_delete_link() {
-        $bp = buddypress();
+        $group = groups_get_current_group();
+        $url   = wp_nonce_url(
+            bp_get_group_manage_url(
+                $group,
+                bp_groups_get_path_chunks( array( 'group-avatar', 'delete' ), 'manage' )
+            ),
+            'bp_group_avatar_delete'
+        );
 
         /**
@@ -5946 +5966 @@
          * @since 1.1.0
          *
-         * @param string $value URL to delete the group avatar.
-         */
-        return apply_filters( 'bp_get_group_avatar_delete_link', wp_nonce_url( trailingslashit( bp_get_group_permalink( $bp->groups->current_group ) . 'admin/group-avatar/delete' ), 'bp_group_avatar_delete' ) );
+         * @param string $url URL to delete the group avatar.
+         */
+        return apply_filters( 'bp_get_group_avatar_delete_link', $url );
     }
 
@@ -6084 +6104 @@
         global $requests_template;
 
-        $link = add_query_arg( array(
-            '_wpnonce' => wp_create_nonce( 'groups_reject_membership_request' ),
-            'user_id'  => $requests_template->request->user_id,
-            'action'   => 'reject'
-        ), trailingslashit( bp_get_group_permalink( groups_get_current_group() ) ) . 'admin/membership-requests/' );
+        $link = add_query_arg(
+            array(
+                '_wpnonce' => wp_create_nonce( 'groups_reject_membership_request' ),
+                'user_id'  => $requests_template->request->user_id,
+                'action'   => 'reject'
+            ),
+            bp_get_group_manage_url(
+                groups_get_current_group(),
+                bp_groups_get_path_chunks( array( 'membership-requests' ), 'manage' )
+            )
+        );
 
         /**
@@ -6095 +6121 @@
          * @since 1.2.6
          *
-         * @param string $value URL to use to reject a membership request.
+         * @param string $link URL to use to reject a membership request.
          */
         return apply_filters( 'bp_get_group_request_reject_link', $link );
@@ -6114 +6140 @@
         global $requests_template;
 
-        $link = add_query_arg( array(
-            '_wpnonce' => wp_create_nonce( 'groups_accept_membership_request' ),
-            'user_id'  => $requests_template->request->user_id,
-            'action'   => 'accept'
-        ), trailingslashit( bp_get_group_permalink( groups_get_current_group() ) ) . 'admin/membership-requests/' );
+        $link = add_query_arg(
+            array(
+                '_wpnonce' => wp_create_nonce( 'groups_accept_membership_request' ),
+                'user_id'  => $requests_template->request->user_id,
+                'action'   => 'accept'
+            ),
+            bp_get_group_manage_url(
+                $group,
+                bp_groups_get_path_chunks( array( 'membership-request' ), 'manage' )
+            )
+        );
 
         /**
@@ -6458 +6490 @@
             $uninvite_url = bp_get_groups_directory_permalink() . 'create/step/group-invites/?user_id=' . $user_id;
         } else {
-            $uninvite_url = trailingslashit( bp_get_group_permalink( groups_get_current_group() ) . 'send-invites/remove/' . $user_id );
+            $uninvite_url = bp_get_group_url(
+                groups_get_current_group(),
+                bp_groups_get_path_chunks( array( 'send-invites', 'remove', $user_id ) )
+            );
         }
 
@@ -6563 +6598 @@
      */
     function bp_get_group_activity_feed_link() {
-        $current_group = groups_get_current_group();
-        $group_link    = bp_get_group_permalink( $current_group ) . 'feed';
-        $feed_link     = trailingslashit( $group_link );
+        $feed_link = bp_get_group_url(
+            groups_get_current_group(),
+            bp_groups_get_path_chunks( array( 'feed' ) )
+        );
 
         /**
@@ -6742 +6778 @@
 
             // Append $action to $url if provided
-            if ( !empty( $action ) ) {
-                $url = bp_get_group_permalink( $current_group ) . $action;
+            if ( ! empty( $action ) ) {
+                $url = bp_get_group_url(
+                    $current_group,
+                    bp_groups_get_path_chunks( array( $action ) )
+                );
             } else {
                 $url = bp_get_group_url( $current_group );

trunk/src/bp-groups/classes/class-bp-group-extension.php

@@ -870 +870 @@
             $current_group = groups_get_group( $this->group_id );
 
-            $no_access_args['message'] = __( 'You do not have access to this content.', 'buddypress' );
-            $no_access_args['root'] = bp_get_group_permalink( $current_group ) . 'home/';
+            $no_access_args['message']  = __( 'You do not have access to this content.', 'buddypress' );
+            $no_access_args['root']     = bp_get_group_url(
+                $current_group,
+                bp_groups_get_path_chunks( array( 'home' ) )
+            );
             $no_access_args['redirect'] = false;
         }

trunk/src/bp-groups/classes/class-bp-groups-group-members-template.php

@@ -169 +169 @@
 
         // Assemble the base URL for pagination.
-        $base_url = trailingslashit( bp_get_group_permalink( $current_group ) . bp_current_action() );
+        $chunks = array( bp_current_action() );
         if ( bp_action_variable() ) {
-            $base_url = trailingslashit( $base_url . bp_action_variable() );
-        }
+            $chunks[] = bp_action_variable();
+        }
+
+        $base_url = bp_get_group_url(
+            $current_group,
+            bp_groups_get_path_chunks( $chunks )
+        );
 
         $members_args = $r;

trunk/src/bp-groups/screens/single/admin.php

@@ -14 +14 @@
  */
 function groups_screen_group_admin() {
-    if ( !bp_is_groups_component() || !bp_is_current_action( 'admin' ) )
+    if ( ! bp_is_groups_component() || ! bp_is_current_action( 'admin' ) ) {
         return false;
+    }
 
-    if ( bp_action_variables() )
+    if ( bp_action_variables() ) {
         return false;
+    }
 
-    bp_core_redirect( bp_get_group_permalink( groups_get_current_group() ) . 'admin/edit-details/' );
+    $redirect = bp_get_group_manage_url(
+        groups_get_current_group(),
+        bp_groups_get_path_chunks( array( 'edit-details' ), 'manage' )
+    );
+
+    bp_core_redirect( $redirect );
 }

trunk/src/bp-groups/screens/single/admin/edit-details.php

@@ -54 +54 @@
             do_action( 'groups_group_details_edited', $bp->groups->current_group->id );
 
-            bp_core_redirect( bp_get_group_permalink( groups_get_current_group() ) . 'admin/edit-details/' );
+            $redirect = bp_get_group_manage_url(
+                groups_get_current_group(),
+                bp_groups_get_path_chunks( array( 'edit-details' ), 'manage' )
+            );
+
+            bp_core_redirect( $redirect );
         }
 

trunk/src/bp-groups/screens/single/admin/group-settings.php

@@ -84 +84 @@
         do_action( 'groups_group_settings_edited', $bp->groups->current_group->id );
 
-        bp_core_redirect( bp_get_group_permalink( groups_get_current_group() ) . 'admin/group-settings/' );
+        $redirect = bp_get_group_manage_url(
+            groups_get_current_group(),
+            bp_groups_get_path_chunks( array( 'group-settings' ), 'manage' )
+        );
+
+        bp_core_redirect( $redirect );
     }
 

trunk/src/bp-groups/screens/single/admin/manage-members.php

@@ -15 +15 @@
 function groups_screen_group_admin_manage_members() {
 
-    if ( 'manage-members' != bp_get_group_current_admin_tab() )
+    if ( 'manage-members' != bp_get_group_current_admin_tab() ) {
         return false;
+    }
 
-    if ( ! bp_is_item_admin() )
+    if ( ! bp_is_item_admin() ) {
         return false;
+    }
 
-    $bp = buddypress();
+    $bp       = buddypress();
+    $redirect = bp_get_group_manage_url(
+        groups_get_current_group(),
+        bp_groups_get_path_chunks( array( 'manage-members' ), 'manage' )
+    );
 
     if ( bp_action_variable( 1 ) && bp_action_variable( 2 ) && bp_action_variable( 3 ) ) {
@@ -29 +35 @@
 
             // Check the nonce first.
-            if ( !check_admin_referer( 'groups_promote_member' ) )
+            if ( ! check_admin_referer( 'groups_promote_member' ) ) {
                 return false;
+            }
 
             // Promote a user.
-            if ( !groups_promote_member( $user_id, $bp->groups->current_group->id, $status ) )
+            if ( ! groups_promote_member( $user_id, $bp->groups->current_group->id, $status ) ) {
                 bp_core_add_message( __( 'There was an error when promoting that user. Please try again.', 'buddypress' ), 'error' );
-            else
+            } else {
                 bp_core_add_message( __( 'User promoted successfully', 'buddypress' ) );
+            }
 
             /**
@@ -48 +56 @@
             do_action( 'groups_promoted_member', $user_id, $bp->groups->current_group->id );
 
-            bp_core_redirect( bp_get_group_permalink( groups_get_current_group() ) . 'admin/manage-members/' );
+            bp_core_redirect( $redirect );
         }
     }
@@ -57 +65 @@
 
             // Check the nonce first.
-            if ( !check_admin_referer( 'groups_demote_member' ) )
+            if ( ! check_admin_referer( 'groups_demote_member' ) ) {
                 return false;
+            }
 
             // Stop sole admins from abandoning their group.
             $group_admins = groups_get_group_admins( $bp->groups->current_group->id );
-            if ( 1 == count( $group_admins ) && $group_admins[0]->user_id == $user_id )
+            if ( 1 == count( $group_admins ) && $group_admins[0]->user_id == $user_id ) {
                 bp_core_add_message( __( 'This group must have at least one admin', 'buddypress' ), 'error' );
 
-            // Demote a user.
-            elseif ( !groups_demote_member( $user_id, $bp->groups->current_group->id ) )
+                // Demote a user.
+            } elseif ( ! groups_demote_member( $user_id, $bp->groups->current_group->id ) ) {
                 bp_core_add_message( __( 'There was an error when demoting that user. Please try again.', 'buddypress' ), 'error' );
-            else
+            } else {
                 bp_core_add_message( __( 'User demoted successfully', 'buddypress' ) );
+            }
 
             /**
@@ -81 +91 @@
             do_action( 'groups_demoted_member', $user_id, $bp->groups->current_group->id );
 
-            bp_core_redirect( bp_get_group_permalink( groups_get_current_group() ) . 'admin/manage-members/' );
+            bp_core_redirect( $redirect );
         }
 
@@ -88 +98 @@
 
             // Check the nonce first.
-            if ( !check_admin_referer( 'groups_ban_member' ) )
+            if ( ! check_admin_referer( 'groups_ban_member' ) ) {
                 return false;
+            }
 
             // Ban a user.
-            if ( !groups_ban_member( $user_id, $bp->groups->current_group->id ) )
+            if ( ! groups_ban_member( $user_id, $bp->groups->current_group->id ) ) {
                 bp_core_add_message( __( 'There was an error when banning that user. Please try again.', 'buddypress' ), 'error' );
-            else
+            } else {
                 bp_core_add_message( __( 'User banned successfully', 'buddypress' ) );
+            }
 
             /**
@@ -107 +119 @@
             do_action( 'groups_banned_member', $user_id, $bp->groups->current_group->id );
 
-            bp_core_redirect( bp_get_group_permalink( groups_get_current_group() ) . 'admin/manage-members/' );
+            bp_core_redirect( $redirect );
         }
 
@@ -114 +126 @@
 
             // Check the nonce first.
-            if ( !check_admin_referer( 'groups_unban_member' ) )
+            if ( ! check_admin_referer( 'groups_unban_member' ) ) {
                 return false;
+            }
 
             // Remove a ban for user.
-            if ( !groups_unban_member( $user_id, $bp->groups->current_group->id ) )
+            if ( ! groups_unban_member( $user_id, $bp->groups->current_group->id ) ) {
                 bp_core_add_message( __( 'There was an error when unbanning that user. Please try again.', 'buddypress' ), 'error' );
-            else
+            } else {
                 bp_core_add_message( __( 'User ban removed successfully', 'buddypress' ) );
+            }
 
             /**
@@ -133 +147 @@
             do_action( 'groups_unbanned_member', $user_id, $bp->groups->current_group->id );
 
-            bp_core_redirect( bp_get_group_permalink( groups_get_current_group() ) . 'admin/manage-members/' );
+            bp_core_redirect( $redirect );
         }
 
@@ -140 +154 @@
 
             // Check the nonce first.
-            if ( !check_admin_referer( 'groups_remove_member' ) )
+            if ( ! check_admin_referer( 'groups_remove_member' ) ) {
                 return false;
+            }
 
             // Remove a user.
-            if ( !groups_remove_member( $user_id, $bp->groups->current_group->id ) )
+            if ( ! groups_remove_member( $user_id, $bp->groups->current_group->id ) ) {
                 bp_core_add_message( __( 'There was an error removing that user from the group. Please try again.', 'buddypress' ), 'error' );
-            else
+            } else {
                 bp_core_add_message( __( 'User removed successfully', 'buddypress' ) );
+            }
 
             /**
@@ -159 +175 @@
             do_action( 'groups_removed_member', $user_id, $bp->groups->current_group->id );
 
-            bp_core_redirect( bp_get_group_permalink( groups_get_current_group() ) . 'admin/manage-members/' );
+            bp_core_redirect( $redirect );
         }
     }

trunk/src/bp-groups/screens/single/admin/membership-requests.php

@@ -72 +72 @@
          */
         do_action( 'groups_group_request_managed', $bp->groups->current_group->id, $request_action, $membership_id, $user_id, $group_id );
-        bp_core_redirect( bp_get_group_permalink( groups_get_current_group() ) . 'admin/membership-requests/' );
+
+        $redirect = bp_get_group_manage_url(
+            groups_get_current_group(),
+            bp_groups_get_path_chunks( array( 'membership-requests' ), 'manage' )
+        );
+
+        bp_core_redirect( $redirect );
     }
 

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

@@ -140 +140 @@
 
 /**
- * Get members path chunks using an array of URL slugs.
+ * Get single member's path chunks using an array of URL slugs.
  *
  * @since 12.0.0
@@ -164 +164 @@
     }
 
-    if ( $chunks && $item_component_rewrite_id_suffix && $item_component_rewrite_id_suffix ) {
+    if ( $chunks && $item_component_rewrite_id_suffix && $item_action_rewrite_id_suffix ) {
         foreach ( $chunks as $chunk ) {
-            $item_action_variable_rewrite_id_suffix        =  str_replace( '-', '_', $chunk );
-            $path_chunks['single_item_action_variables'][] = bp_rewrites_get_slug( 'members', 'member_' . $item_component_rewrite_id_suffix . '_' . $item_action_rewrite_id_suffix . '_' . $item_action_variable_rewrite_id_suffix, $chunk );
+            if ( is_numeric( $chunk ) ) {
+                $path_chunks['single_item_action_variables'][] = $chunk;
+            } else {
+                $item_action_variable_rewrite_id_suffix        =  str_replace( '-', '_', $chunk );
+                $path_chunks['single_item_action_variables'][] = bp_rewrites_get_slug( 'members', 'member_' . $item_component_rewrite_id_suffix . '_' . $item_action_rewrite_id_suffix . '_' . $item_action_variable_rewrite_id_suffix, $chunk );
+            }
         }
     }

trunk/src/bp-templates/bp-legacy/buddypress-functions.php

@@ -1423 +1423 @@
         $user = new BP_Core_User( $friend_id );
 
-        $uninvite_url = bp_is_current_action( 'create' )
-            ? bp_get_groups_directory_permalink() . 'create/step/group-invites/?user_id=' . $friend_id
-            : bp_get_group_permalink( $group )    . 'send-invites/remove/' . $friend_id;
+        if ( bp_is_current_action( 'create' ) ) {
+            $uninvite_url = bp_get_groups_directory_permalink() . 'create/step/group-invites/?user_id=' . $friend_id;
+        } else {
+            $path_chunks  = bp_groups_get_path_chunks( array( 'send-invites', 'remove', $friend_id ) );
+            $uninvite_url = bp_get_group_url( $group, $path_chunks );
+        }
 
         echo '<li id="uid-' . esc_attr( $user->id ) . '">';
@@ -1641 +1644 @@
                 _e( 'Error joining group', 'buddypress' );
             } else {
-                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button leave-group" rel="leave" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+                $leave_url = wp_nonce_url(
+                    bp_get_group_url(
+                        $group,
+                        bp_groups_get_path_chunks( array( 'leave-group' ) )
+                    ),
+                    'groups_leave_group'
+                );
+                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button leave-group" rel="leave" href="' . esc_url( $leave_url ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
             }
         break;
@@ -1655 +1665 @@
                 _e( 'Error requesting membership', 'buddypress' );
             } else {
-                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button leave-group" rel="leave" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
+                $leave_url = wp_nonce_url(
+                    bp_get_group_url(
+                        $group,
+                        bp_groups_get_path_chunks( array( 'leave-group' ) )
+                    ),
+                    'groups_leave_group'
+                );
+                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button leave-group" rel="leave" href="' . esc_url( $leave_url ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
             }
         break;
@@ -1675 +1692 @@
                 _e( 'Error leaving group', 'buddypress' );
             } elseif ( 'public' === $group->status ) {
-                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button join-group" rel="join" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
+                $join_url = wp_nonce_url(
+                    bp_get_group_url(
+                        $group,
+                        bp_groups_get_path_chunks( array( 'join' ) )
+                    ),
+                    'groups_join_group'
+                );
+                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button join-group" rel="join" href="' . esc_url( $join_url ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
             } else {
-                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button request-membership" rel="join" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'request-membership', 'groups_request_membership' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
+                $request_url = wp_nonce_url(
+                    bp_get_group_url(
+                        $group,
+                        bp_groups_get_path_chunks( array( 'request-membership' ) )
+                    ),
+                    'groups_request_membership'
+                );
+                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button request-membership" rel="join" href="' . esc_url( $request_url ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
             }
         break;