Ticket #4954: 4954.patch

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

@@ -2350 +2350 @@
         function bp_get_activity_comment_form_nojs_display() {
                 global $activities_template;
 
-                if ( isset( $_GET['ac'] ) && ( $_GET['ac'] === ( $activities_template->activity->id . '/' ) ) ) {
+                $compare_with = $activities_template->activity->id . '/';
+                if ( bp_use_wp_rewrites() && ! bp_has_pretty_links() ) {
+                        $compare_with = (string) $activities_template->activity->id;
+                }
+
+                if ( isset( $_GET['ac'] ) && ( $_GET['ac'] === $compare_with ) ) {
                         return 'style="display: block"';
                 }
 

src/bp-activity/classes/class-bp-activity-component.php

@@ -180 +180 @@
                         'slug'                  => BP_ACTIVITY_SLUG,
                         'root_slug'             => isset( $bp->pages->activity->slug ) ? $bp->pages->activity->slug : BP_ACTIVITY_SLUG,
                         'has_directory'         => true,
+                        'rewrite_ids'           => array(
+                                'directory'                    => 'bp_activities',
+                                'single_item_action'           => 'bp_activity_action',
+                                'single_item_action_variables' => 'bp_activity_action_variables',
+                        ),
                         'directory_title'       => isset( $bp->pages->activity->title ) ? $bp->pages->activity->title : $default_directory_title,
                         'notification_callback' => 'bp_activity_format_notifications',
                         'search_string'         => __( 'Search Activity...', 'buddypress' ),
@@ -226 +231 @@
                         'position'            => 10,
                         'screen_function'     => 'bp_activity_screen_my_activity',
                         'default_subnav_slug' => 'just-me',
-                        'item_css_id'         => $this->id
+                        'item_css_id'         => $this->id,
+                        'rewrite_id'          => 'bp_member_' . $slug,
                 );
 
                 // Add the subnav items to the activity nav item if we are using a theme that supports this.
@@ -435 +441 @@
 
                 parent::setup_cache_groups();
         }
+
+        /**
+         * Add the component's rewrite tags.
+         *
+         * @since 6.0.0
+         *
+         * @param array $rewrite_tags Optional. See BP_Component::add_rewrite_tags() for
+         *                            description.
+         */
+        public function add_rewrite_tags( $rewrite_tags = array() ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::add_rewrite_tags( $rewrite_tags );
+                }
+
+                $rewrite_tags = array(
+                        'directory' => array(
+                                'id'    => '%' . $this->rewrite_ids['directory'] . '%',
+                                'regex' => '([1]{1,})',
+                        ),
+                        'single-item-action' => array(
+                                'id'      => '%' . $this->rewrite_ids['single_item_action'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                        'single-item-action-variables' => array(
+                                'id'      => '%' . $this->rewrite_ids['single_item_action_variables'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                );
+
+                parent::add_rewrite_tags( $rewrite_tags );
+        }
+
+        /**
+         * Add the component's rewrite rules.
+         *
+         * @since 6.0.0
+         *
+         * @param array $rewrite_rules Optional. See BP_Component::add_rewrite_rules() for
+         *                             description.
+         */
+        public function add_rewrite_rules( $rewrite_rules = array() ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::add_rewrite_rules( $rewrite_rules );
+                }
+
+                $rewrite_rules = array(
+                        'paged-directory' => array(
+                                'regex' => $this->root_slug . '/page/?([0-9]{1,})/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&paged=$matches[1]',
+                        ),
+                        'single-item-action-variables' => array(
+                                'regex' => $this->root_slug . '/([^/]+)\/(.+?)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['single_item_action'] . '=$matches[1]&' . $this->rewrite_ids['single_item_action_variables'] . '=$matches[2]',
+                        ),
+                        'single-item-action' => array(
+                                'regex' => $this->root_slug . '/([^/]+)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['single_item_action'] . '=$matches[1]',
+                        ),
+                        'directory' => array(
+                                'regex' => $this->root_slug,
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1',
+                        ),
+                );
+
+                parent::add_rewrite_rules( $rewrite_rules );
+        }
+
+        /**
+         * Add the component's directory permastructs.
+         *
+         * @since 6.0.0
+         *
+         * @param array $structs Optional. See BP_Component::add_permastructs() for
+         *                       description.
+         */
+        public function add_permastructs( $structs = array() ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::add_permastructs( $structs );
+                }
+
+                $permastructs = array(
+                        // Directory permastruct.
+                        $this->rewrite_ids['directory'] => array(
+                                'struct' => $this->directory_permastruct,
+                                'args'   => array(),
+                        ),
+                );
+
+                parent::add_permastructs( $permastructs );
+        }
+
+        /**
+         * Parse the WP_Query and eventually display the component's directory or single item.
+         *
+         * @since 6.0.0
+         *
+         * @param WP_Query $query Required. See BP_Component::parse_query() for
+         *                        description.
+         */
+        public function parse_query( WP_Query $query ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::parse_query( $query );
+                }
+
+                $is_activity_component  = 1 === (int) $query->get( $this->rewrite_ids['directory'] );
+                $bp                     = buddypress();
+
+                if ( $is_activity_component ) {
+                        $bp->current_component = 'activity';
+
+                        $current_action = $query->get( $this->rewrite_ids['single_item_action'] );
+                        if ( $current_action ) {
+                                $bp->current_action = $current_action;
+                        }
+
+                        $action_variables = $query->get( $this->rewrite_ids['single_item_action_variables'] );
+                        if ( $action_variables ) {
+                                if ( ! is_array( $action_variables ) )  {
+                                        $bp->action_variables = explode( '/', ltrim( $action_variables, '/' ) );
+                                } else {
+                                        $bp->action_variables = $action_variables;
+                                }
+                        }
+
+                        /**
+                         * Set the BuddyPress queried object.
+                         */
+                        $query->queried_object    = get_post( $bp->pages->activity->id );
+                        $query->queried_object_id = $query->queried_object->ID;
+                }
+
+                parent::parse_query( $query );
+        }
 }

src/bp-blogs/bp-blogs-template.php

@@ -95 +95 @@
                 return apply_filters( 'bp_get_blogs_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) );
         }
 
+/**
+ * Output the create blog link.
+ *
+ * @since 6.0.0
+ *
+ */
+function bp_blog_create_link() {
+        echo esc_url( bp_get_blog_create_link() );
+}
+        /**
+         * Return the create blog link.
+         *
+         * @since 6.0.0
+         *
+         * @return string The URL of the create blog link.
+         */
+        function bp_get_blog_create_link() {
+
+                /**
+                 * Filters the blog create blog link.
+                 *
+                 * @since 6.0.0
+                 *
+                 * @param string $value Permalink URL for the create blog link.
+                 */
+                return apply_filters( 'bp_get_blog_create_link', trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) . 'create/' );
+        }
+
 /**
  * Rewind the blogs and reset blog index.
  */
@@ -1354 +1382 @@
                         'component'  => 'blogs',
                         'link_text'  => __( 'Create a Site', 'buddypress' ),
                         'link_class' => 'blog-create no-ajax',
-                        'link_href'  => trailingslashit( bp_get_blogs_directory_permalink() . 'create' ),
+                        'link_href'  => bp_get_blog_create_link(),
                         'wrapper'    => false,
                         'block_self' => false,
                 );

src/bp-blogs/classes/class-bp-blogs-component.php

@@ -75 +75 @@
                         'slug'                  => BP_BLOGS_SLUG,
                         'root_slug'             => isset( $bp->pages->blogs->slug ) ? $bp->pages->blogs->slug : BP_BLOGS_SLUG,
                         'has_directory'         => is_multisite(), // Non-multisite installs don't need a top-level Sites directory, since there's only one site.
+                        'rewrite_ids'           => array(
+                                'directory'                    => 'bp_blogs',
+                                'single_item_action'           => 'bp_blogs_action',
+                                'single_item_action_variables' => 'bp_blogs_action_variables',
+                        ),
                         'directory_title'       => isset( $bp->pages->blogs->title ) ? $bp->pages->blogs->title : $default_directory_title,
                         'notification_callback' => 'bp_blogs_format_notifications',
                         'search_string'         => __( 'Search sites...', 'buddypress' ),
@@ -233 +238 @@
                         'position'            => 30,
                         'screen_function'     => 'bp_blogs_screen_my_blogs',
                         'default_subnav_slug' => 'my-sites',
-                        'item_css_id'         => $this->id
+                        'item_css_id'         => $this->id,
+                        'rewrite_id'          => 'bp_member_' . $slug,
                 );
 
                 $sub_nav[] = array(
@@ -300 +306 @@
                                         'parent'   => 'my-account-' . $this->id,
                                         'id'       => 'my-account-' . $this->id . '-create',
                                         'title'    => __( 'Create a Site', 'buddypress' ),
-                                        'href'     => trailingslashit( bp_get_blogs_directory_permalink() . 'create' ),
+                                        'href'     => bp_get_blog_create_link(),
                                         'position' => 99
                                 );
                         }
@@ -352 +358 @@
 
                 parent::setup_cache_groups();
         }
+
+        /**
+         * Add the component's rewrite tags.
+         *
+         * @since 6.0.0
+         *
+         * @param array $rewrite_tags Optional. See BP_Component::add_rewrite_tags() for
+         *                            description.
+         */
+        public function add_rewrite_tags( $rewrite_tags = array() ) {
+                if ( ! bp_use_wp_rewrites() || ! is_multisite() ) {
+                        return parent::add_rewrite_tags( $rewrite_tags );
+                }
+
+                $rewrite_tags = array(
+                        'directory' => array(
+                                'id'    => '%' . $this->rewrite_ids['directory'] . '%',
+                                'regex' => '([1]{1,})',
+                        ),
+                        'single-item-action' => array(
+                                'id'      => '%' . $this->rewrite_ids['single_item_action'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                        'single-item-action-variables' => array(
+                                'id'      => '%' . $this->rewrite_ids['single_item_action_variables'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                );
+
+                parent::add_rewrite_tags( $rewrite_tags );
+        }
+
+        /**
+         * Add the component's rewrite rules.
+         *
+         * @since 6.0.0
+         *
+         * @param array $rewrite_rules Optional. See BP_Component::add_rewrite_rules() for
+         *                             description.
+         */
+        public function add_rewrite_rules( $rewrite_rules = array() ) {
+                if ( ! bp_use_wp_rewrites() || ! is_multisite() ) {
+                        return parent::add_rewrite_rules( $rewrite_rules );
+                }
+
+                $rewrite_rules = array(
+                        'paged-directory' => array(
+                                'regex' => $this->root_slug . '/page/?([0-9]{1,})/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&paged=$matches[1]',
+                        ),
+                        'single-item-action-variables' => array(
+                                'regex' => $this->root_slug . '/([^/]+)\/(.+?)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['single_item_action'] . '=$matches[1]&' . $this->rewrite_ids['single_item_action_variables'] . '=$matches[2]',
+                        ),
+                        'single-item-action' => array(
+                                'regex' => $this->root_slug . '/([^/]+)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['single_item_action'] . '=$matches[1]',
+                        ),
+                        'directory' => array(
+                                'regex' => $this->root_slug,
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1',
+                        ),
+                );
+
+                parent::add_rewrite_rules( $rewrite_rules );
+        }
+
+        /**
+         * Add the component's directory permastructs.
+         *
+         * @since 6.0.0
+         *
+         * @param array $structs Optional. See BP_Component::add_permastructs() for
+         *                       description.
+         */
+        public function add_permastructs( $structs = array() ) {
+                if ( ! bp_use_wp_rewrites() || ! is_multisite() ) {
+                        return parent::add_permastructs( $structs );
+                }
+
+                $permastructs = array(
+                        // Directory permastruct.
+                        $this->rewrite_ids['directory'] => array(
+                                'struct' => $this->directory_permastruct,
+                                'args'   => array(),
+                        ),
+                );
+
+                parent::add_permastructs( $permastructs );
+        }
+
+        /**
+         * Parse the WP_Query and eventually display the component's directory or single item.
+         *
+         * @since 6.0.0
+         *
+         * @param WP_Query $query Required. See BP_Component::parse_query() for
+         *                        description.
+         */
+        public function parse_query( WP_Query $query ) {
+                if ( ! bp_use_wp_rewrites() || ! is_multisite() ) {
+                        return parent::parse_query( $query );
+                }
+
+                $is_blogs_component  = 1 === (int) $query->get( $this->rewrite_ids['directory'] );
+                $bp                     = buddypress();
+
+                if ( $is_blogs_component ) {
+                        $bp->current_component = 'blogs';
+
+                        $current_action = $query->get( $this->rewrite_ids['single_item_action'] );
+                        if ( $current_action ) {
+                                $bp->current_action = $current_action;
+                        }
+
+                        $action_variables = $query->get( $this->rewrite_ids['single_item_action_variables'] );
+                        if ( $action_variables ) {
+                                if ( ! is_array( $action_variables ) )  {
+                                        $bp->action_variables = explode( '/', ltrim( $action_variables, '/' ) );
+                                } else {
+                                        $bp->action_variables = $action_variables;
+                                }
+                        }
+
+                        /**
+                         * Set the BuddyPress queried object.
+                         */
+                        $query->queried_object    = get_post( $bp->pages->blogs->id );
+                        $query->queried_object_id = $query->queried_object->ID;
+                }
+
+                parent::parse_query( $query );
+        }
 }

src/bp-core/admin/bp-core-admin-components.php

@@ -268 +268 @@
                 // Load up BuddyPress.
                 $bp = buddypress();
 
+                // Save a copy of the current active components
+                $active_components = $bp->active_components;
+
                 // Save settings and upgrade schema.
                 require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
                 require_once( $bp->plugin_dir . '/bp-core/admin/bp-core-admin-schema.php' );
@@ -278 +281 @@
                 bp_core_install( $bp->active_components );
                 bp_core_add_page_mappings( $bp->active_components );
                 bp_update_option( 'bp-active-components', $bp->active_components );
+
+                // Compare the copy of active components with submitted one to eventually update rewrite rules.
+                if ( bp_use_wp_rewrites() && array_diff_key( $active_components, $bp->active_components ) ) {
+                        bp_delete_rewrite_rules();
+                }
         }
 
         // Where are we redirecting to?

src/bp-core/admin/bp-core-admin-functions.php

@@ -239 +239 @@
         }
 
         // Add notice if no rewrite rules are enabled.
-        if ( empty( $wp_rewrite->permalink_structure ) ) {
+        if ( empty( $wp_rewrite->permalink_structure ) && ! bp_use_wp_rewrites() ) {
                 bp_core_add_admin_notice( sprintf( __( '<strong>BuddyPress is almost ready</strong>. You must <a href="%s">update your permalink structure</a> to something other than the default for it to work.', 'buddypress' ), admin_url( 'options-permalink.php' ) ), 'error' );
         }
 
@@ -435 +435 @@
                 ),
         );
 
+        if ( bp_use_wp_rewrites() ) {
+                $tabs['1'] = array(
+                        'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-rewrites-settings' ), 'admin.php' ) ),
+                        'name' => __( 'URLs', 'buddypress' )
+                );
+        }
+
         /**
          * Filters the tab data used in our wp-admin screens.
          *

new file src/bp-core/admin/bp-core-admin-rewrites.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Admin Rewrites Functions.
+ *
+ * @package BuddyPress
+ * @subpackage CoreAdministration
+ * @since 6.0.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Renders BuddyPress URLs admin panel.
+ *
+ * @since 6.0.O
+ */
+function bp_core_admin_rewrites_settings() {
+        $bp = buddypress();
+?>
+
+        <div class="wrap">
+
+                <h1><?php esc_html_e( 'BuddyPress URLs', 'buddypress' ); ?> </h1>
+
+                <h2 class="nav-tab-wrapper"><?php bp_core_admin_tabs( __( 'URLs', 'buddypress' ) ); ?></h2>
+                <form action="" method="post" id="bp-admin-rewrites-form">
+
+                        <?php foreach ( $bp->pages as $component_id => $directory_data ) : ?>
+
+                                <h2><?php echo esc_html( $directory_data->title ); ?></h2>
+                                <table class="form-table" role="presentation">
+                                        <tr>
+                                                <th scope="row">
+                                                        <label for="<?php printf( esc_attr__( '%s-directory-slug', 'buddypress' ), $component_id ); ?>">
+                                                                <?php printf( esc_html__( 'Directory slug', 'buddypress' ), $directory_data->title ); ?>
+                                                        </label>
+                                                </th>
+                                                <td>
+                                                        <input type="text" class="code" name="<?php printf( 'components[%d][post_name]', absint( $directory_data->id ) ); ?>" id="<?php printf( esc_attr__( '%s-directory-slug', 'buddypress' ), $component_id ); ?>" value="<?php echo esc_attr( $directory_data->slug ); ?>">
+                                                </td>
+                                        </tr>
+                                </table>
+
+                                <?php if ( 'members' === $component_id ) : ?>
+                                        <h3><?php esc_html_e( 'Single Member primary navigation slugs', 'buddypress' ); ?></h3>
+                                        <table class="form-table" role="presentation">
+                                                <?php foreach ( $bp->members->nav->get_primary() as $primary_nav_item ) :
+                                                        if ( ! isset( $primary_nav_item['rewrite_id'] ) || ! $primary_nav_item['rewrite_id'] ) {
+                                                                continue;
+                                                        }
+                                                ?>
+                                                        <tr>
+                                                                <th scope="row">
+                                                                        <label style="margin-left: 2em; display: inline-block; vertical-align: middle" for="<?php printf( esc_attr__( '%s-slug', 'buddypress' ), $primary_nav_item['rewrite_id'] ); ?>">
+                                                                                <?php printf( esc_html__( '"%s" slug', 'buddypress' ), $primary_nav_item['name'] ); ?>
+                                                                        </label>
+                                                                </th>
+                                                                <td>
+                                                                        <input type="text" class="code" name="<?php printf( 'components[%1$d][_bp_component_slugs][%2$s]', absint( $directory_data->id ), esc_attr( $primary_nav_item['rewrite_id'] ) ); ?>" id="<?php printf( esc_attr__( '%s-slug', 'buddypress' ), $primary_nav_item['rewrite_id'] ); ?>" value="<?php echo esc_attr( bp_rewrites_get_slug( $component_id, $primary_nav_item['rewrite_id'], $primary_nav_item['slug'] ) ); ?>">
+                                                                </td>
+                                                        </tr>
+                                                <?php endforeach ; ?>
+                                        </table>
+                                <?php endif ; ?>
+
+                        <?php endforeach ; ?>
+
+                        <p class="submit clear">
+                                <input class="button-primary" type="submit" name="bp-admin-rewrites-submit" id="bp-admin-rewrites-submit" value="<?php esc_attr_e( 'Save Settings', 'buddypress' ) ?>"/>
+                        </p>
+
+                        <?php wp_nonce_field( 'bp-admin-rewrites-setup' ); ?>
+
+                </form>
+        </div>
+
+<?php
+}
+
+/**
+ * Switch directory pages between the `page` & the `bp_directories`
+ * post types and update WP Nav items.
+ *
+ * This is what allowes a user to test our new parser, making sure he can
+ * come back to the legacy one in case a plugin/theme is not ready yet.
+ *
+ * @since 6.0.0
+ *
+ * @param bool $use_rewrite Whether to use the Legacy parser or the WP Rewrites.
+ */
+function bp_core_admin_rewrites_update_directory_pages( $use_rewrite = false ) {
+        $bp_pages          = bp_core_get_directory_pages();
+        $nav_menu_item_ids = array();
+
+        $post_type   = 'page';
+        $item_object = 'bp_directories';
+        if ( $use_rewrite ) {
+                $post_type = 'bp_directories';
+                $item_object = 'page';
+        }
+
+        foreach ( $bp_pages as $bp_page ) {
+                $nav_menu_item_ids[] = $bp_page->id;
+
+                // Switch the post type.
+                wp_update_post( array( 'ID' => $bp_page->id, 'post_type' => $post_type ) );
+        }
+
+        // Update nav menu items!
+        $nav_menus = wp_get_nav_menus( array( 'hide_empty' => true ) );
+        foreach ( $nav_menus as $nav_menu ) {
+                $items = wp_get_nav_menu_items( $nav_menu->term_id );
+
+                foreach( $items as $item ) {
+                        if ( $item_object !== $item->object || ! in_array( $item->object_id, $nav_menu_item_ids, true ) ) {
+                                continue;
+                        }
+
+                        wp_update_nav_menu_item( $nav_menu->term_id, $item->ID, array(
+                                'menu-item-db-id'       => $item->db_id,
+                                'menu-item-object-id'   => $item->object_id,
+                                'menu-item-object'      => $post_type,
+                                'menu-item-parent-id'   => $item->menu_item_parent,
+                                'menu-item-position'    => $item->menu_order,
+                                'menu-item-type'        => 'post_type',
+                                'menu-item-title'       => $item->title,
+                                'menu-item-url'         => $item->url,
+                                'menu-item-description' => $item->description,
+                                'menu-item-attr-title'  => $item->attr_title,
+                                'menu-item-target'      => $item->target,
+                                'menu-item-classes'     => implode( ' ', (array) $item->classes ),
+                                'menu-item-xfn'         => $item->xfn,
+                                'menu-item-status'      => 'publish',
+                        ) );
+                }
+        }
+}
+
+/**
+ * Handle saving of the BuddyPress customizable slugs.
+ *
+ * @since 6.0.0
+ */
+function bp_core_admin_rewrites_setup_handler() {
+
+        if ( ! isset( $_POST['bp-admin-rewrites-submit'] ) ) {
+                return;
+        }
+
+        check_admin_referer( 'bp-admin-rewrites-setup' );
+
+        $base_url = bp_get_admin_url( add_query_arg( 'page', 'bp-rewrites-settings', 'admin.php' ) );
+
+        if ( ! isset( $_POST['components'] ) ) {
+                wp_safe_redirect( add_query_arg( 'error', 'true', $base_url ) );
+        }
+
+        $current_page_slugs   = wp_list_pluck( bp_core_get_directory_pages(), 'slug', 'id' );
+        $directory_slug_edits = array();
+        foreach ( $_POST['components'] as $page_id => $slugs ) {
+                $postarr = array();
+
+                if ( ! isset( $current_page_slugs[ $page_id ] ) )  {
+                        continue;
+                }
+
+                $postarr['ID'] = $page_id;
+
+                if ( $current_page_slugs[ $page_id ] !== $slugs['post_name'] ) {
+                        $directory_slug_edits[] = $page_id;
+                        $postarr['post_name'] = $slugs['post_name'];
+                }
+
+                if ( isset( $slugs['_bp_component_slugs'] ) && is_array( $slugs['_bp_component_slugs'] ) ) {
+                        $postarr['meta_input']['_bp_component_slugs'] = array_map( 'sanitize_title', $slugs['_bp_component_slugs'] );
+                }
+
+                wp_update_post( $postarr );
+        }
+
+        // Make sure the WP rewrites will be regenarated at next page load.
+        if ( $directory_slug_edits ) {
+                bp_delete_rewrite_rules();
+        }
+
+        wp_safe_redirect( add_query_arg( 'updated', 'true', $base_url ) );
+}
+add_action( 'bp_admin_init', 'bp_core_admin_rewrites_setup_handler' );

src/bp-core/admin/bp-core-admin-settings.php

@@ -79 +79 @@
         <?php endif;
 }
 
+function bp_admin_setting_callback_use_wp_rewrites() {
+?>
+
+        <input id="_bp_use_wp_rewrites" name="_bp_use_wp_rewrites" type="checkbox" value="1" <?php checked( bp_use_wp_rewrites() ); ?> />
+        <strong><?php esc_html_e( 'Experimental', 'buddypress' ); ?></strong>
+        <p id="_bp_use_wp_rewrites_description" class="description">
+                <?php esc_html_e( 'By enabling this option, you will be able to try a more WordPress friendly way of building/analysing BuddyPress URLs.', 'buddypress' ); ?>&nbsp;
+                <?php esc_html_e( 'The "Pages" tab will be replaced by a "URLs" one, and you will be able to customize BuddyPress URLs.', 'buddypress' ); ?>&nbsp;
+                <?php esc_html_e( 'If some of your BuddyPress plugins are not ready yet for this great feature, no worries: you can come back at any time to our legacy way of building/analysing BuddyPress URLs by disabling this option.', 'buddypress' ); ?>
+        </p>
+<?php
+}
+
 /** Activity *******************************************************************/
 
 /**
@@ -294 +307 @@
         if ( isset( $_GET['page'] ) && 'bp-settings' == $_GET['page'] && !empty( $_POST['submit'] ) ) {
                 check_admin_referer( 'buddypress-options' );
 
+                // Maybe update rewrite rules.
+                $use_rewrite = bp_use_wp_rewrites();
+                if ( ( ! isset( $_POST['_bp_use_wp_rewrites'] ) && $use_rewrite ) || ( isset( $_POST['_bp_use_wp_rewrites'] ) && ! $use_rewrite ) ) {
+                        bp_delete_rewrite_rules();
+                        bp_core_admin_rewrites_update_directory_pages( isset( $_POST['_bp_use_wp_rewrites'] ) );
+                }
+
                 // Because many settings are saved with checkboxes, and thus will have no values
                 // in the $_POST array when unchecked, we loop through the registered settings.
                 if ( isset( $wp_settings_fields['buddypress'] ) ) {

src/bp-core/bp-core-buddybar.php

@@ -34 +34 @@
  *     @type callable    $screen_function         The callback function that will run when the nav item is clicked.
  *     @type bool|string $default_subnav_slug     Optional. The slug of the default subnav item to select when the nav
  *                                                item is clicked.
+ *     @type string      $rewrite_id              Optional. The rewrite id to allow slug customization.
  * }
  * @param string       $component The component the navigation is attached to. Defaults to 'members'.
  * @return null|false Returns false on failure.
@@ -52 +53 @@
                 'site_admin_only'         => false, // Can only site admins see this nav item?
                 'position'                => 99,    // Index of where this nav item should be positioned.
                 'screen_function'         => false, // The name of the function to run when clicked.
-                'default_subnav_slug'     => false  // The slug of the default subnav item to select when clicked.
+                'default_subnav_slug'     => false, // The slug of the default subnav item to select when clicked.
+                'rewrite_id'              => '',    // The rewrite id to allow slug customization.
         );
 
         $r = wp_parse_args( $args, $defaults );
@@ -96 +98 @@
  * @since 2.6.0 Introduced the `$component` parameter. Began returning a BP_Core_Nav_Item
  *              object on success.
  * @since 4.0.0 Introduced `$component_id` argument.
+ * @since 6.0.0 Introduced the dynamic filter `bp_{$component}_nav_add_item_link`.
  *
  * @param array|string $args {
  *     Array describing the new nav item.
@@ -113 +116 @@
  *     @type callable    $screen_function         The callback function that will run when the nav item is clicked.
  *     @type bool|string $default_subnav_slug     Optional. The slug of the default subnav item to select when the nav
  *                                                item is clicked.
+ *     @type string      $rewrite_id              Optional. The rewrite id to allow slug customization.
  * }
  * @param string       $component Optional. Component that the nav belongs to.
  * @return false|array Returns false on failure, new nav item on success.
@@ -129 +133 @@
                 'site_admin_only'         => false, // Can only site admins see this nav item?
                 'position'                => 99,    // Index of where this nav item should be positioned.
                 'screen_function'         => false, // The name of the function to run when clicked.
-                'default_subnav_slug'     => false  // The slug of the default subnav item to select when clicked.
+                'default_subnav_slug'     => false, // The slug of the default subnav item to select when clicked.
+                'rewrite_id'              => '',    // The rewrite id to allow slug customization.
         );
 
         $r = wp_parse_args( $args, $defaults );
@@ -152 +157 @@
                 $r['item_css_id'] = $r['slug'];
         }
 
-        $nav_item = array(
+        /**
+         * Filter here to edit the component's nav item parameters just before it is added.
+         *
+         * The dynamic portion of the hook will be the component's id the nav item is created for.
+         *
+         * @since 6.0.0
+         *
+         * @param array $value {
+         *     Array describing the new nav item.
+         *     @type string      $component_id            Optional. The ID of the component registering this nav item. Defaults to the
+         *                                                the value of `$slug`.
+         *     @type string      $name                    Display name for the nav item.
+         *     @type string      $slug                    Unique URL slug for the nav item.
+         *     @type string      $link                    The link for the nav item.
+         *     @type bool|string $item_css_id             Optional. 'id' attribute for the nav item. Default: the value of `$slug`.
+         *     @type bool        $show_for_displayed_user Optional. Whether the nav item should be visible when viewing a
+         *                                                member profile other than your own. Default: true.
+         *     @type int         $position                Optional. Numerical index specifying where the item should appear in
+         *                                                the nav array. Default: 99.
+         *     @type callable    $screen_function         The callback function that will run when the nav item is clicked.
+         *     @type bool|string $default_subnav_slug     Optional. The slug of the default subnav item to select when the nav
+         *                                                item is clicked.
+         *     @type string      $rewrite_id              Optional. The rewrite id to allow slug customization.
+         * }
+         */
+        $nav_item = apply_filters( "bp_{$component}_nav_add_item_link", array(
                 'component_id'            => $r['component_id'],
                 'name'                    => $r['name'],
                 'slug'                    => $r['slug'],
@@ -161 +191 @@
                 'show_for_displayed_user' => $r['show_for_displayed_user'],
                 'position'                => $r['position'],
                 'screen_function'         => &$r['screen_function'],
-                'default_subnav_slug'     => $r['default_subnav_slug']
-        );
+                'default_subnav_slug'     => $r['default_subnav_slug'],
+                'rewrite_id'              => $r['rewrite_id'],
+        ) );
 
         // Add the item to the nav.
         buddypress()->{$component}->nav->add_nav( $nav_item );
@@ -475 +506 @@
  *
  * @since 2.4.0
  * @since 2.6.0 Introduced the `$component` parameter. Began returning a BP_Core_Nav_Item object on success.
+ * @since 6.0.0 Introduced the dynamic filter `bp_{$component}_subnav_add_item_link`.
  *
  * @param array|string $args {
  *     Array describing the new subnav item.
@@ -551 +583 @@
                 $r['item_css_id'] = $r['slug'];
         }
 
-        $subnav_item = array(
+        /**
+        * Filter here to edit the component's sub nav item parameters just before it is added.
+        *
+        * The dynamic portion of the hook will be the component's id the nav item is created for.
+        *
+        * @since 6.0.0
+        *
+        * @param array $value {
+        *     Array describing the new nav item.
+        *     @type string      $name              Display name for the subnav item.
+        *     @type string      $link              The link for the subnav item.
+        *     @type string      $slug              Unique URL slug for the subnav item.
+        *     @type string      $parent_slug       Slug of the top-level nav item under which the
+        *                                          new subnav item should be added.
+        *     @type bool|string $item_css_id       Optional. 'id' attribute for the subnav item. Default: the value of `$slug`.
+        *     @type int         $position          Optional. Numerical index specifying where the item should appear in
+        *                                          the subnav array. Default: 99.
+        *     @type bool        $user_has_access   Optional. True if the logged-in user has access to the
+        *                                          subnav item, otherwise false. Can be set dynamically
+        *                                          when registering the subnav; eg, use bp_is_my_profile()
+        *                                          to restrict access to profile owners only. Default: true.
+        *     @type string      $no_access_url     The link to redirect to if the user can't access the subnav item.
+        *     @type callable    $screen_function   The callback function that will run when the subnav item is clicked.
+        *     @type bool        $show_in_admin_bar Optional. Whether the subnav item should be added into
+        *                                          the group's "Edit" Admin Bar menu for group admins.
+        *                                          Default: false.
+        * }
+        */
+        $subnav_item = apply_filters( "bp_{$component}_subnav_add_item_link", array(
                 'name'              => $r['name'],
                 'link'              => $r['link'],
                 'slug'              => $r['slug'],
@@ -562 +622 @@
                 'no_access_url'     => $r['no_access_url'],
                 'screen_function'   => &$r['screen_function'],
                 'show_in_admin_bar' => (bool) $r['show_in_admin_bar'],
-        );
+        ) );
 
         buddypress()->{$component}->nav->add_nav( $subnav_item );
 

src/bp-core/bp-core-catchuri.php

@@ -515 +515 @@
                         $wp_query->is_page     = true;
                         $wp_query->is_singular = true;
                         $wp_query->is_404      = false;
+
+                        if ( bp_use_wp_rewrites() ) {
+                                $wp_query->is_home = false;
+                        }
                 }
 
                 /**

src/bp-core/bp-core-functions.php

@@ -628 +628 @@
                                                 }
 
                                                 $pages->{$component_id}->slug = implode( '/', array_reverse( (array) $slug ) );
+
+                                                if ( bp_use_wp_rewrites() ) {
+                                                        $pages->{$component_id}->custom_slugs = get_post_meta( $page_name->ID, '_bp_component_slugs', true );
+                                                }
                                         }
 
                                         unset( $slug );

src/bp-core/bp-core-options.php

@@ -74 +74 @@
                 // Email unsubscribe salt.
                 'bp-emails-unsubscribe-salt'           => '',
 
+                // Rewrites
+                '_bp_use_wp_rewrites'                  => false,
+
                 /* Groups ************************************************************/
 
                 // @todo Move this into the groups component
@@ -750 +753 @@
          */
         return apply_filters( 'bp_get_theme_package_id', bp_get_option( '_bp_theme_package_id', $default ) );
 }
+
+/**
+ * Check wether BuddyPress is using WP Rewrites.
+ *
+ * @since 6.0.0
+ *
+ * @param bool $default Optional. Fallback value if not found in the database.
+ *                      Default: false.
+ * @return bool True if BuddyPress uses WP Rewrites, otherwise false.
+ */
+function bp_use_wp_rewrites( $default = false ) {
+
+        /**
+         * Filters wether BuddyPress should use WP Rewrites.
+         *
+         * @since 6.0.0
+         *
+         * @param bool $value Whether or not Rewrites are enabled.
+         */
+        return apply_filters( 'bp_use_wp_rewrites', bp_get_option( '_bp_use_wp_rewrites', $default ) );
+}

new file src/bp-core/bp-core-rewrites.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Rewrites.
+ *
+ * @package BuddyPress
+ * @subpackage Core
+ * @since 6.0.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Delete rewrite rules, so that they are automatically rebuilt on
+ * the subsequent page load.
+ *
+ * @since 6.0.0
+ */
+function bp_delete_rewrite_rules() {
+        delete_option( 'rewrite_rules' );
+}
+
+/**
+ * Are pretty links active ?
+ *
+ * @since 6.0.0
+ *
+ * @return bool True if pretty links are on. False otherwise.
+ */
+function bp_has_pretty_links() {
+        return !! get_option( 'permalink_structure', '' );
+}
+
+/**
+ * Let's experiment WordPress URL rewriting in BuddyPress!
+ *
+ * If the Custom URLs option is active, this will neutralize our
+ * legacy parser in favor of the WP URL Rewrites API.
+ *
+ * @since 6.0.0
+ */
+function bp_disable_legacy_url_parser() {
+        if ( ! bp_use_wp_rewrites() ) {
+                return;
+        }
+
+        // First let's neutalize our legacy URL parser.
+        remove_action( 'bp_init', 'bp_core_set_uri_globals', 2 );
+
+        // These hooks need to happen later.
+        remove_action( 'bp_init', 'bp_setup_canonical_stack', 5 );
+        add_action( 'bp_parse_query', 'bp_setup_canonical_stack', 11 );
+        remove_action( 'bp_init', 'bp_setup_title', 8 );
+        add_action( 'bp_parse_query', 'bp_setup_title', 14 );
+
+        /**
+         * This hook needs to happen later on front-end only.
+         *
+         * @see `bp_nav_menu_get_loggedin_pages()`
+         */
+        if ( ! is_admin() ) {
+                remove_action( 'bp_init', 'bp_setup_nav', 6 );
+                add_action( 'bp_parse_query', 'bp_setup_nav', 12 );
+        }
+
+        // Then register a custom post type to use for the directory pages.
+        register_post_type( 'bp_directories', array(
+                'label'               => _x( 'BuddyPress directories', 'Post type label used in the Admin menu.', 'buddypress' ),
+                'labels'              => array(
+                        'singular_name' => _x( 'BuddyPress directory', 'Post type singular name', 'buddypress' ),
+                ),
+                'description'         => __( 'The BuddyPress directories post type is used when the custom URLs option is active.', 'buddypress' ),
+                'public'              => false,
+                'hierarchical'        => true,
+                'exclude_from_search' => true,
+                'publicly_queryable'  => false,
+                'show_in_nav_menus'   => true,
+                'show_in_rest'        => false,
+                'supports'            => array( 'title' ),
+                'has_archive'         => false,
+                'rewrite'             => false,
+                'query_var'           => false,
+                'delete_with_user'    => false,
+        ) );
+
+        /**
+         * Then start using a new way of building BuddyPress URLs.
+         *
+         * Using filters let us safelyt edit our legacy way of building URLs.
+         */
+        $filters = array(
+                'bp_core_get_user_domain' => array(
+                        'function' => '_bp_rewrites_get_user_link',
+                        'num_args' => 3,
+                ),
+                'bp_get_members_directory_permalink' => array(
+                        'function' => '_bp_rewrites_get_users_link',
+                        'num_args' => 1,
+                ),
+                'bp_get_member_type_directory_permalink' => array(
+                        'function' => '_bp_rewrites_get_users_type_link',
+                        'num_args' => 2,
+                ),
+                'bp_members_nav_add_item_link' => array(
+                        'function' => '_bp_rewrites_members_nav_link',
+                        'num_args' => 1,
+                ),
+                'bp_members_subnav_add_item_link' => array(
+                        'function' => '_bp_rewrites_members_nav_link',
+                        'num_args' => 1,
+                ),
+                'bp_activity_admin_nav' => array(
+                        'function' => '_bp_rewrites_user_admin_nav_link',
+                        'num_args' => 1,
+                ),
+                'bp_blogs_admin_nav' => array(
+                        'function' => '_bp_rewrites_user_admin_nav_link',
+                        'num_args' => 1,
+                ),
+                'bp_friends_admin_nav' => array(
+                        'function' => '_bp_rewrites_user_admin_nav_link',
+                        'num_args' => 1,
+                ),
+                'bp_groups_admin_nav' => array(
+                        'function' => '_bp_rewrites_user_admin_nav_link',
+                        'num_args' => 1,
+                ),
+                'bp_messages_admin_nav' => array(
+                        'function' => '_bp_rewrites_user_admin_nav_link',
+                        'num_args' => 1,
+                ),
+                'bp_notifications_admin_nav' => array(
+                        'function' => '_bp_rewrites_user_admin_nav_link',
+                        'num_args' => 1,
+                ),
+                'bp_settings_admin_nav' => array(
+                        'function' => '_bp_rewrites_user_admin_nav_link',
+                        'num_args' => 1,
+                        'priority' => 3, // After xProfile filter.
+                ),
+                'bp_xprofile_admin_nav' => array(
+                        'function' => '_bp_rewrites_user_admin_nav_link',
+                        'num_args' => 1,
+                ),
+                'bp_get_the_profile_group_edit_form_action' => array(
+                        'function' => '_bp_rewrites_xprofile_group_edit_url',
+                        'num_args' => 2,
+                ),
+                'bp_members_edit_profile_url' => array(
+                        'function' => '_bp_rewrites_edit_profile_url',
+                        'num_args' => 3,
+                ),
+                'bp_get_signup_page'  => array(
+                        'function' => '_bp_rewrites_get_signup_link',
+                        'num_args' => 1,
+                ),
+                'bp_get_activation_page'  => array(
+                        'function' => '_bp_rewrites_get_activation_link',
+                        'num_args' => 3,
+                ),
+                'bp_get_group_permalink' => array(
+                        'function' => '_bp_rewrites_get_group_url',
+                        'num_args' => 2,
+                ),
+                'bp_get_groups_directory_permalink' => array(
+                        'function' => '_bp_rewrites_get_groups_url',
+                        'num_args' => 1,
+                ),
+                'bp_get_group_type_directory_permalink' => array(
+                        'function' => '_bp_rewrites_get_group_type_url',
+                        'num_args' => 2,
+                ),
+                'bp_groups_subnav_add_item_link' => array(
+                        'function' => '_bp_rewrites_groups_nav_link',
+                        'num_args' => 1,
+                ),
+                'bp_get_groups_action_link' => array(
+                        'function' => '_bp_rewrites_get_group_admin_link',
+                        'num_args' => 4,
+                ),
+                'bp_group_admin_form_action' => array(
+                        'function' => '_bp_rewrites_get_group_admin_form_url',
+                        'num_args' => 3,
+                ),
+                'bp_get_group_create_link' => array(
+                        'function' => '_bp_rewrites_get_group_create_link',
+                        'num_args' => 2,
+                ),
+                'bp_get_activity_directory_permalink' => array(
+                        'function' => '_bp_rewrites_get_activities_url',
+                        'num_args' => 1,
+                ),
+                'bp_get_activity_post_form_action' => array(
+                        'function' => '_bp_rewrites_get_activity_post_form_action',
+                        'num_args' => 1,
+                ),
+                'bp_get_activity_comment_form_action' => array(
+                        'function' => '_bp_rewrites_get_activity_comment_form_action',
+                        'num_args' => 1,
+                ),
+                'bp_activity_get_permalink' => array(
+                        'function' => '_bp_rewrites_get_activity_url',
+                        'num_args' => 2,
+                ),
+                'bp_activity_permalink_redirect_url' => array(
+                        'function' => '_bp_rewrites_get_activity_permalink_redirect_url',
+                        'num_args' => 2,
+                ),
+                'bp_get_activity_comment_link' => array(
+                        'function' => '_bp_rewrites_get_activity_comment_url',
+                        'num_args' => 1,
+                ),
+                'bp_get_activity_favorite_link' => array(
+                        'function' => '_bp_rewrites_get_activity_favorite_url',
+                        'num_args' => 1,
+                ),
+                'bp_get_activity_unfavorite_link' => array(
+                        'function' => '_bp_rewrites_get_activity_unfavorite_url',
+                        'num_args' => 1,
+                ),
+                'bp_get_activity_delete_url' => array(
+                        'function' => '_bp_rewrites_get_activity_delete_url',
+                        'num_args' => 1,
+                ),
+                'bp_get_sitewide_activity_feed_link' => array(
+                        'function' => '_bp_rewrites_get_sitewide_activity_feed_url',
+                        'num_args' => 1,
+                ),
+                'bp_get_activities_member_rss_link' => array(
+                        'function' => '_bp_rewrites_get_activities_member_rss_url',
+                        'num_args' => 1,
+                ),
+                'bp_get_blogs_directory_permalink' => array(
+                        'function' => '_bp_rewrites_get_blogs_url',
+                        'num_args' => 1,
+                ),
+                'bp_get_blog_create_link' => array(
+                        'function' => '_bp_rewrites_get_blog_create_url',
+                        'num_args' => 1,
+                ),
+        );
+
+        foreach ( $filters as $legacy => $rewrite ) {
+                if ( ! isset( $rewrite['priority'] ) ) {
+                        $rewrite['priority'] = 1;
+                }
+
+                add_filter( $legacy, $rewrite['function'], $rewrite['priority'], $rewrite['num_args'] );
+        }
+}
+add_action( 'bp_init', 'bp_disable_legacy_url_parser', 1 );
+
+/**
+ * Make sure WP Nav Menus still use the right links.
+ *
+ * @since 6.0.0
+ *
+ * @param  string  $link The post type link.
+ * @param  WP_Post $post The post type object.
+ * @return string        The post type link.
+ */
+function bp_page_directory_link( $link, WP_Post $post ) {
+        if ( 'bp_directories' !== get_post_type( $post ) ) {
+                return $link;
+        }
+
+        $directory_pages = wp_filter_object_list( (array) bp_core_get_directory_pages(), array( 'id' => $post->ID ) ) ;
+        $component       = key( $directory_pages );
+
+        return bp_rewrites_get_link( array( 'component_id' => $component ) );
+}
+add_filter( 'post_type_link', 'bp_page_directory_link', 1, 2 );
+
+/**
+ * Get needed data to find a member single item from the request.
+ *
+ * @since 6.0.0
+ *
+ * @param string $request The request used during parsing.
+ * @return array Data to find a member single item from the request.
+ */
+function bp_rewrites_get_member_data( $request = '' ) {
+        $member_data = array( 'field' => 'slug' );
+
+        if ( bp_is_username_compatibility_mode() ) {
+                $member_data = array( 'field' => 'login' );
+        }
+
+        if ( bp_core_enable_root_profiles() ) {
+                if ( ! $request ) {
+                        $request = $GLOBALS['wp']->request;
+                }
+
+                $request_chunks = explode( '/', ltrim( $request, '/' ) );
+                $member_chunk   = reset( $request_chunks );
+
+                // Try to get an existing member to eventually reset the WP Query.
+                $member_data['object'] = get_user_by( $member_data['field'], $member_chunk );
+        }
+
+        return $member_data;
+}
+
+function bp_rewrites_get_member_slug( $user_id = 0 ) {
+        $bp = buddypress();
+
+        $prop = 'user_nicename';
+        if ( bp_is_username_compatibility_mode() ) {
+                $prop = 'user_login';
+        }
+
+        if ( (int) $user_id === (int) bp_displayed_user_id() ) {
+                $slug = isset( $bp->displayed_user->userdata->{$prop} ) ? $bp->displayed_user->userdata->{$prop} : null;
+        } elseif ( (int) $user_id === (int) bp_loggedin_user_id() ) {
+                $slug = isset( $bp->loggedin_user->userdata->{$prop} ) ? $bp->loggedin_user->userdata->{$prop} : null;
+        } else {
+                $slug = bp_core_get_username( $user_id );
+        }
+
+        return $slug;
+}
+
+/**
+ * Makes sure BuddyPress globals are set during Ajax requests.
+ *
+ * @since 6.0.0
+ */
+function bp_parse_ajax_referer_query() {
+        if ( ! wp_doing_ajax() || ! bp_use_wp_rewrites() ) {
+                return;
+        }
+
+        $bp       = buddypress();
+        $bp->ajax = (object) array(
+                'WP' => new WP(),
+        );
+
+        bp_reset_query( bp_get_referer_path(), $GLOBALS['wp_query'] );
+}
+add_action( 'bp_admin_init', 'bp_parse_ajax_referer_query' );
+
+/**
+ * Resets the query to fit our permalink structure if needed.
+ *
+ * This is used for specific cases such as Root Member's profile or Ajax.
+ *
+ * @since 6.0.0
+ *
+ * @param string $bp_request A specific BuddyPress request.
+ * @param WP_Query $query The WordPress query object.
+ */
+function bp_reset_query( $bp_request = '', WP_Query $query ) {
+        global $wp;
+        $bp = buddypress();
+
+        // Back up request uri.
+        $reset_server_request_uri = $_SERVER['REQUEST_URI'];
+
+        // Temporarly override it.
+        if ( isset( $wp->request ) ) {
+                $_SERVER['REQUEST_URI'] = str_replace( $wp->request, $bp_request, $reset_server_request_uri );
+
+                // Reparse request.
+                $wp->parse_request();
+
+                // Reparse query.
+                bp_remove_all_filters( 'parse_query' );
+                $query->parse_query( $wp->query_vars );
+                bp_restore_all_filters( 'parse_query' );
+
+        } elseif ( isset( $bp->ajax ) ) {
+                $_SERVER['REQUEST_URI'] = $bp_request;
+
+                if ( bp_has_pretty_links() ) {
+                        $bp->ajax->WP->parse_request();
+
+                        // Extra step to check for root profiles.
+                        $member = bp_rewrites_get_member_data( $bp->ajax->WP->request );
+                        if ( isset( $member['object'] ) && $member['object'] ) {
+                                $_SERVER['REQUEST_URI'] = trailingslashit( $bp->members->root_slug ) . $bp->ajax->WP->request;
+
+                                // Reparse the request.
+                                $bp->ajax->WP->parse_request();
+                        }
+
+                        $matched_query = $bp->ajax->WP->matched_query;
+                } else {
+                        $matched_query = wp_parse_url( $bp_request, PHP_URL_QUERY );
+                }
+
+                $query->parse_query( $matched_query );
+
+                // BP Parse the request in components only once per Ajax request.
+                remove_action( 'parse_query', 'bp_parse_query', 2 );
+        }
+
+        // Restore request uri.
+        $_SERVER['REQUEST_URI'] = $reset_server_request_uri;
+
+        // The query is reset.
+        return true;
+}
+
+/**
+ * Returns the slug to use for the nav item of the requested component.
+ *
+ * @since 6.0.0
+ *
+ * @param string $component_id The BuddyPress component's ID.
+ * @param string $rewrite_id   The nav item's rewrite ID.
+ * @param string $default_slug The nav item's default slug.
+ * @return string              The slug to use for the nav item of the requested component.
+ */
+function bp_rewrites_get_slug( $component_id = '', $rewrite_id = '', $default_slug = '' ) {
+        $directory_pages = bp_core_get_directory_pages();
+        $slug            = $default_slug;
+
+        if ( ! isset( $directory_pages->{$component_id}->custom_slugs ) || ! $rewrite_id ) {
+                return $slug;
+        }
+
+        $custom_slugs = (array) $directory_pages->{$component_id}->custom_slugs;
+        if ( isset( $custom_slugs[ $rewrite_id ] ) && $custom_slugs[ $rewrite_id ] ) {
+                $slug = $custom_slugs[ $rewrite_id ];
+        }
+
+        return $slug;
+}
+
+function bp_rewrites_get_custom_slug_rewrite_id( $component_id = '', $slug = '' ) {
+        $directory_pages = bp_core_get_directory_pages();
+
+        if ( ! isset( $directory_pages->{$component_id}->custom_slugs ) || ! $slug ) {
+                return null;
+        }
+
+        $custom_slugs = (array) $directory_pages->{$component_id}->custom_slugs;
+
+        // If there's a match it's a custom slug.
+        return array_search( $slug, $custom_slugs );
+}
+
+/**
+ * Builds a BuddyPress link using the WP Rewrite API.
+ *
+ * @todo Allow customization using `bp_rewrites_get_slug()`
+ *       Describe parameter.
+ *
+ * @since 6.0.0
+ *
+ * @param array $args
+ * @return string The BuddyPress link.
+ */
+function bp_rewrites_get_link( $args = array() ) {
+        $bp   = buddypress();
+        $link = '#';
+
+        $r = wp_parse_args( $args, array(
+                'component_id'                 => '',
+                'directory_type'               => '',
+                'single_item'                  => '',
+                'single_item_component'        => '',
+                'single_item_action'           => '',
+                'single_item_action_variables' => array(),
+        ) );
+
+        $is_pretty_links = bp_has_pretty_links();
+
+        if ( ! isset( $bp->{$r['component_id']} ) ) {
+                return $link;
+        }
+
+        $component = $bp->{$r['component_id']};
+        unset( $r['component_id'] );
+
+        // Using plain links.
+        if ( ! $is_pretty_links ) {
+                if ( ! isset( $r['member_register'] ) && ! isset( $r['member_activate'] ) ) {
+                        $r['directory'] = 1;
+                }
+
+                $r              = array_filter( $r );
+                $qv             = array();
+
+                foreach ( $component->rewrite_ids as $key => $rewrite_id ) {
+                        if ( ! isset( $r[ $key ] ) ) {
+                                continue;
+                        }
+
+                        $qv[ $rewrite_id ] = $r[ $key ];
+                }
+
+                $link = add_query_arg( $qv, home_url( '/' ) );
+
+        // Using pretty links.
+        } else {
+                if ( ! isset( $component->rewrite_ids['directory'] ) || ! isset( $component->directory_permastruct ) ) {
+                        return $link;
+                }
+
+                if ( isset( $r['member_register'] ) ) {
+                        $link = str_replace( '%' . $component->rewrite_ids['member_register'] . '%', '', $component->register_permastruct );
+                        unset( $r['member_register'] );
+                } elseif ( isset( $r['member_activate'] ) ) {
+                        $link = str_replace( '%' . $component->rewrite_ids['member_activate'] . '%', '', $component->activate_permastruct );
+                        unset( $r['member_activate'] );
+                } elseif ( isset( $r['create_single_item'] ) ) {
+                        $link = str_replace( '%' . $component->rewrite_ids['directory'] . '%', 'create', $component->directory_permastruct );
+                        unset( $r['create_single_item'] );
+                } else {
+                        $link = str_replace( '%' . $component->rewrite_ids['directory'] . '%', $r['single_item'], $component->directory_permastruct );
+
+                        // Remove the members directory slug when root profiles are on.
+                        if ( bp_core_enable_root_profiles() && 'members' === $component->id && isset( $r['single_item'] ) && $r['single_item'] ) {
+                                $link = str_replace( $bp->members->root_slug . '/', '', $link );
+                        }
+
+                        unset( $r['single_item'] );
+                }
+
+                $r = array_filter( $r );
+
+                if ( isset( $r['directory_type'] ) && $r['directory_type'] ) {
+                        if ( 'members' === $component->id ) {
+                                array_unshift( $r, bp_get_members_member_type_base() );
+                        } elseif ( 'groups' === $component->id ) {
+                                array_unshift( $r, bp_get_groups_group_type_base() );
+                        } else {
+                                unset( $r['directory_type'] );
+                        }
+                }
+
+                if ( isset( $r['single_item_action_variables'] ) && $r['single_item_action_variables'] ) {
+                        $r['single_item_action_variables'] = join( '/', (array) $r['single_item_action_variables'] );
+                }
+
+                if ( isset( $r['create_single_item_variables'] ) && $r['create_single_item_variables'] ) {
+                        $r['create_single_item_variables'] = join( '/', (array) $r['create_single_item_variables'] );
+                }
+
+                $link = home_url( user_trailingslashit( '/' . rtrim( $link, '/' ) . '/' . join( '/', $r ) ) );
+        }
+
+        return $link;
+}
+
+function _bp_rewrites_get_user_link( $link = '', $user_id = 0, $username = '' ) {
+        if ( ! $user_id ) {
+                return $link;
+        }
+
+        $bp = buddypress();
+        if ( ! $username ) {
+                $username = bp_rewrites_get_member_slug( $user_id );
+        }
+
+        return bp_rewrites_get_link( array(
+                'component_id' => 'members',
+                'single_item'  => $username,
+        ) );
+}
+
+function _bp_rewrites_get_users_link( $link = '' ) {
+        return bp_rewrites_get_link( array(
+                'component_id' => 'members',
+        ) );
+}
+
+function _bp_rewrites_get_users_type_link( $link = '', $type = null ) {
+        if ( ! isset( $type->directory_slug ) ) {
+                return $link;
+        }
+
+        return bp_rewrites_get_link( array(
+                'component_id'   => 'members',
+                'directory_type' => $type->directory_slug,
+        ) );
+}
+
+/**
+ * Edit the link parameter of the members primary/secondary nav item links.
+ *
+ * @see bp_core_create_nav_link() for description of parameters.
+ *
+ * @since 6.0.0
+ *
+ * @param  array $args The arguments used to create the primary/secondary nav item.
+ * @return array       The arguments used to create the primary/secondary nav item.
+ */
+function _bp_rewrites_members_nav_link( $args = array() ) {
+        $bp      = buddypress();
+        $user_id = bp_displayed_user_id();
+        if ( ! $user_id ) {
+                $user_id = bp_loggedin_user_id();
+        }
+
+        $username = bp_rewrites_get_member_slug( $user_id );
+        if ( ! $username ) {
+                return $args;
+        }
+
+        if ( 'bp_members_nav_add_item_link' === current_filter() ) {
+                $link_params = array(
+                        'component_id'          => 'members',
+                        'single_item'           => $username,
+                        'single_item_component' => bp_rewrites_get_slug( 'members', $args['rewrite_id'], $args['slug'] ),
+                );
+        } else {
+                $parent_nav = $bp->members->nav->get_primary( array( 'slug' => $args['parent_slug'] ), false );
+                if ( ! $parent_nav ) {
+                        return $args;
+                }
+
+                $parent_nav = reset( $parent_nav );
+                if ( ! isset( $parent_nav->rewrite_id ) ) {
+                        return $args;
+                }
+
+                $link_params = array(
+                        'component_id'          => 'members',
+                        'single_item'           => $username,
+                        'single_item_component' => bp_rewrites_get_slug( 'members', $parent_nav->rewrite_id, $args['parent_slug'] ),
+                        'single_item_action'    => $args['slug'],
+                );
+        }
+
+        if ( ! isset( $link_params ) ) {
+                return $args;
+        }
+
+        // Override the nav link.
+        $args['link'] = bp_rewrites_get_link( $link_params );
+
+        return $args;
+}
+
+function _bp_rewrites_user_admin_nav_link( $wp_admin_nav = array() ) {
+        $bp = buddypress();
+        $username = bp_rewrites_get_member_slug( bp_loggedin_user_id() );
+        if ( ! $username ) {
+                return $wp_admin_nav;
+        }
+
+        $parent         = '';
+        $component_slug = '';
+        $link_args      = array(
+                'component_id' => 'members',
+                'single_item'  => $username,
+        );
+
+        foreach ( $wp_admin_nav as $index_nav => $nav_item ) {
+                $component      = '';
+                $component_url  = '';
+
+                if ( bp_has_pretty_links() ) {
+                        $url_parts = explode( '/', rtrim( wp_parse_url( $wp_admin_nav[ $index_nav ]['href'], PHP_URL_PATH ), '/' ) );
+                } else {
+                        $url_parts = wp_parse_args( wp_parse_url( $wp_admin_nav[ $index_nav ]['href'], PHP_URL_QUERY ), array() );
+
+                        if ( isset( $url_parts['bp_member'] ) ) {
+                                // Move added slugs to the `bp_member` query var at the end of the URL parts.
+                                $url_parts = array_merge(
+                                        $url_parts,
+                                        explode( '/', rtrim( str_replace( $username, '', $url_parts['bp_member'] ), '/' ) )
+                                );
+
+                                // Make sure the `bp_member` query var is consistent.
+                                $url_parts['bp_member'] = $username;
+                        }
+                }
+
+                $slug = end( $url_parts );
+
+                // Make sure to reset the item action at each loop.
+                $link_args['single_item_action']    = '';
+
+                // This is the single item compnent's main nav item.
+                if ( $bp->my_account_menu_id === $nav_item['parent'] ) {
+                        /**
+                         * Make sure to reset the item component, component slug and parent
+                         * at each main nav item change.
+                         */
+                        $link_args['single_item_component'] = '';
+                        $component_slug                     = '';
+                        $parent                             = '';
+
+                        $component      = str_replace( 'my-account-', '', $nav_item['id'] );
+                        $parent         = $nav_item['id'];
+                        $component_slug = $slug;
+
+                        // Specific to Extended Profiles.
+                        if ( 'xprofile' === $component ) {
+                                $component = 'profile';
+                        }
+
+                        $link_args['single_item_component'] = bp_rewrites_get_slug( 'members', 'bp_member_' . $component, $component_slug );
+                        $wp_admin_nav[ $index_nav ]['href'] = bp_rewrites_get_link( $link_args );
+                }
+
+                if ( $component_slug && $parent === $nav_item['parent'] && false !== strpos( $nav_item['href'], $username ) ) {
+                        $link_args['single_item_action']    = $slug !== $component_slug ? $slug : '';
+                        $wp_admin_nav[ $index_nav ]['href'] = bp_rewrites_get_link( $link_args );
+                }
+        }
+
+        return $wp_admin_nav;
+}
+
+function _bp_rewrites_edit_profile_url( $profile_link = '', $url = '', $user_id = 0 ) {
+        if ( ! is_admin() && bp_is_active( 'xprofile' ) ) {
+                $profile_link = bp_rewrites_get_link( array(
+                        'component_id'          => 'members',
+                        'single_item'           => bp_rewrites_get_member_slug( $user_id ),
+                        'single_item_component' => bp_rewrites_get_slug( 'members', 'bp_member_profile', bp_get_profile_slug() ),
+                        'single_item_action'    => 'edit'
+                ) );
+        }
+
+        return $profile_link;
+}
+
+function _bp_rewrites_get_signup_link( $link = '' ) {
+        return bp_rewrites_get_link( array(
+                'component_id'    => 'members',
+                'member_register' => 1,
+        ) );
+}
+
+function _bp_rewrites_get_activation_link( $link = '', $key = '', $has_custom_activation_page = false ) {
+        if ( ! $has_custom_activation_page ) {
+                return $link;
+        }
+
+        $link_params = array(
+                'component_id'    => 'members',
+                'member_activate' => 1,
+        );
+
+        if ( $key ) {
+                $link_params['member_activate_key'] = $key;
+        }
+
+        return bp_rewrites_get_link( $link_params );
+}
+
+function _bp_rewrites_get_group_url( $link = '', $group = null ) {
+        if ( ! isset( $group->id ) || ! $group->id ) {
+                return $link;
+        }
+
+        return bp_rewrites_get_link( array(
+                'component_id' => 'groups',
+                'single_item'  => bp_get_group_slug( $group ),
+        ) );
+}
+
+function _bp_rewrites_get_groups_url( $link = '' ) {
+        return bp_rewrites_get_link( array(
+                'component_id' => 'groups',
+        ) );
+}
+
+function _bp_rewrites_get_group_type_url( $link = '', $type = null ) {
+        if ( ! isset( $type->directory_slug ) ) {
+                return $link;
+        }
+
+        return bp_rewrites_get_link( array(
+                'component_id'   => 'groups',
+                'directory_type' => $type->directory_slug,
+        ) );
+}
+
+/**
+ * Edit the link parameter of the group's secondary nav item links.
+ *
+ * @see bp_core_create_subnav_link() for description of parameters.
+ *
+ * @since 6.0.0
+ *
+ * @param  array $args The arguments used to create the secondary nav item.
+ * @return array       The arguments used to create the secondary nav item.
+ */
+function _bp_rewrites_groups_nav_link( $args = array() ) {
+        if ( ! isset( $args['parent_slug'] ) || ! isset( $args['slug'] ) ) {
+                return $args;
+        }
+
+        $single_item        = $args['parent_slug'];
+        $single_item_action = $args['slug'];
+
+        if ( false !== strpos( $single_item, '_manage' ) ) {
+                $single_item_action = 'admin';
+                $single_item = str_replace( '_manage', '', $single_item );
+        }
+
+        $link_params = array(
+                'component_id'       => 'groups',
+                'single_item'        => $single_item,
+                'single_item_action' => $single_item_action,
+        );
+
+        if ( 'admin' === $single_item_action && 'admin' !== $args['slug'] ) {
+                $link_params['single_item_action_variables'] = explode( '/', $args['slug'] );
+        }
+
+        $args['link'] = bp_rewrites_get_link( $link_params );
+
+        return $args;
+}
+
+function _bp_rewrites_get_group_admin_link( $link = '', $action = '', $query_args = array(), $nonce = false ) {
+        if ( ! $action ) {
+                return $link;
+        }
+
+        $group = groups_get_current_group();
+        if ( ! isset( $group->slug ) ) {
+                return $link;
+        }
+
+        $single_item_action_variables = explode( '/', rtrim( $action, '/' ) );
+        $single_item_action           = array_shift( $single_item_action_variables );
+
+        $link = bp_rewrites_get_link( array(
+                'component_id'                 => 'groups',
+                'single_item'                  => $group->slug,
+                'single_item_action'           => $single_item_action,
+                'single_item_action_variables' => $single_item_action_variables,
+        ) );
+
+        if ( $query_args && is_array( $query_args ) ) {
+                $link = add_query_arg( $query_args, $link );
+        }
+
+        if ( true === $nonce ) {
+                $link = wp_nonce_url( $link );
+        } elseif ( is_string( $nonce ) ) {
+                $link = wp_nonce_url( $link, $nonce );
+        }
+
+        return $link;
+}
+
+function _bp_rewrites_get_group_admin_form_url( $link = '', $group = null, $page = '' ) {
+        if ( ! isset( $group->slug ) || ! $page ) {
+                return $link;
+        }
+
+        return bp_rewrites_get_link( array(
+                'component_id'                 => 'groups',
+                'single_item'                  => $group->slug,
+                'single_item_action'           => 'admin',
+                'single_item_action_variables' => array( $page ),
+        ) );
+}
+
+function _bp_rewrites_get_group_create_link( $link = '', $step = '' ) {
+        $link_params = array(
+                'component_id'       => 'groups',
+                'create_single_item' => 1,
+        );
+
+        if ( $step ) {
+                $link_params['create_single_item_variables'] = array( 'step', $step );
+        }
+
+        return bp_rewrites_get_link( $link_params );
+}
+
+function _bp_rewrites_get_activities_url( $link = '' ) {
+        return bp_rewrites_get_link( array(
+                'component_id' => 'activity',
+        ) );
+}
+
+function _bp_rewrites_get_activity_post_form_action( $link = '' ) {
+        return bp_rewrites_get_link( array(
+                'component_id'       => 'activity',
+                'single_item_action' => 'post',
+        ) );
+}
+
+function _bp_rewrites_get_activity_comment_form_action( $link = '' ) {
+        return bp_rewrites_get_link( array(
+                'component_id'       => 'activity',
+                'single_item_action' => 'reply',
+        ) );
+}
+
+function _bp_rewrites_get_activity_url( $link = '', $activity = null ) {
+        if ( ! isset( $activity->primary_link ) || $link === $activity->primary_link ) {
+                return $link;
+        }
+
+        $link_params = array(
+                'component_id'                 => 'activity',
+                'single_item_action'           => 'p',
+                'single_item_action_variables' => array( $activity->id ),
+        );
+
+        if ( 'activity_comment' === $activity->type ) {
+                $link_params['single_item_action_variables'] = array( $activity->item_id );
+        }
+
+        $link = bp_rewrites_get_link( $link_params );
+
+        if ( 'activity_comment' === $activity->type ) {
+                $link .= '#acomment-' . $activity->id;
+        }
+
+        return $link;
+}
+
+function _bp_rewrites_get_activity_comment_url( $link = '' ) {
+        if ( bp_has_pretty_links() ) {
+                return $link;
+        }
+
+        $url_parts = explode( '/', $link );
+        $query_var = wp_parse_args( ltrim( $url_parts[0], '?' ), array( 'ac' => 0 ) );
+        $anchor    = end( $url_parts );
+
+        if ( bp_is_activity_directory() ) {
+                $link = _bp_rewrites_get_activities_url();
+
+        } else {
+                global $activities_template;
+
+                $link = bp_rewrites_get_link( array(
+                        'component_id'                 => 'activity',
+                        'single_item_action'           => 'p',
+                        'single_item_action_variables' => array( $activities_template->activity->id ),
+                ) );
+        }
+
+        return add_query_arg( $query_var, $link ) . $anchor;
+}
+
+function _bp_rewrites_get_activity_favorite_url( $link = '' ) {
+        global $activities_template;
+
+        $link = bp_rewrites_get_link( array(
+                'component_id'                 => 'activity',
+                'single_item_action'           => 'favorite',
+                'single_item_action_variables' => array( $activities_template->activity->id ),
+        ) );
+
+        return wp_nonce_url( $link, 'mark_favorite' );
+}
+
+function _bp_rewrites_get_activity_unfavorite_url(  $link = '' ) {
+        global $activities_template;
+
+        $link = bp_rewrites_get_link( array(
+                'component_id'                 => 'activity',
+                'single_item_action'           => 'unfavorite',
+                'single_item_action_variables' => array( $activities_template->activity->id ),
+        ) );
+
+        return wp_nonce_url( $link, 'unmark_favorite' );
+}
+
+function _bp_rewrites_get_activity_delete_url( $link = '' ) {
+        global $activities_template;
+        $query_vars = wp_parse_args( wp_parse_url( $link, PHP_URL_QUERY ), array() );
+
+        $link = bp_rewrites_get_link( array(
+                'component_id'                 => 'activity',
+                'single_item_action'           => 'delete',
+                'single_item_action_variables' => array( $activities_template->activity->id ),
+        ) );
+
+        return add_query_arg( $query_vars, $link );
+}
+
+function _bp_rewrites_get_sitewide_activity_feed_url( $link = '' ) {
+        return bp_rewrites_get_link( array(
+                'component_id'       => 'activity',
+                'single_item_action' => 'feed',
+        ) );
+}
+
+function _bp_rewrites_get_activities_member_rss_url( $link = '' ) {
+        $link_params = array(
+                'component_id'          => 'members',
+                'single_item'           => bp_rewrites_get_member_slug( bp_displayed_user_id() ),
+                'single_item_component' => bp_rewrites_get_slug( 'members', 'bp_member_activity', bp_get_activity_slug() ),
+        );
+
+        if ( bp_is_user_activity() ) {
+                if ( bp_is_user_friends_activity() ) {
+                        $link_params['single_item_action'] = bp_get_friends_slug();
+                        $link_params['single_item_action_variables'] = 'feed';
+                } elseif( bp_is_user_groups_activity() ) {
+                        $link_params['single_item_action'] = bp_get_groups_slug();
+                        $link_params['single_item_action_variables'] = 'feed';
+                } elseif( 'favorites' === bp_current_action() ) {
+                        $link_params['single_item_action'] = 'favorites';
+                        $link_params['single_item_action_variables'] = 'feed';
+                } elseif( 'mentions' === bp_current_action() && bp_activity_do_mentions() ) {
+                        $link_params['single_item_action'] = 'mentions';
+                        $link_params['single_item_action_variables'] = 'feed';
+                } else {
+                        $link_params['single_item_action'] = 'feed';
+                }
+        }
+
+        return bp_rewrites_get_link( $link_params );
+}
+
+function _bp_rewrites_get_activity_permalink_redirect_url( $redirect = '', $activity = null ) {
+        if ( ! $redirect || ! isset( $activity->user_id ) ) {
+                return $redirect;
+        }
+
+        // This shouldn't happen so often!
+        if ( bp_is_active( 'groups') && 'groups' === $activity->component && ! $activity->user_id ) {
+                $group = groups_get_group( $activity->item_id );
+
+                $link_params = array(
+                        'component_id'                 => 'groups',
+                        'single_item'                  => bp_get_group_slug( $group ),
+                        'single_item_action'           => bp_get_activity_slug(),
+                        'single_item_action_variables' => array( $activity->id ),
+                );
+        } else {
+                $link_params = array(
+                        'component_id'          => 'members',
+                        'single_item'           => bp_rewrites_get_member_slug( $activity->user_id ),
+                        'single_item_component' => bp_rewrites_get_slug( 'members', 'bp_member_activity', bp_get_activity_slug() ),
+                        'single_item_action'    => $activity->id,
+                );
+        }
+
+        $redirect = bp_rewrites_get_link( $link_params );
+
+        // If set, add the original query string back onto the redirect URL.
+        if ( isset( $_SERVER['QUERY_STRING'] ) ) {
+                $query_vars = array();
+                wp_parse_str( $_SERVER['QUERY_STRING'], $query_vars );
+                $exclude_vars = array_intersect_key( $query_vars, array_flip( buddypress()->activity->rewrite_ids ) );
+                $query_vars = array_diff_key( $query_vars, $exclude_vars );
+
+                if ( $query_vars ) {
+                        $redirect = add_query_arg( urlencode_deep( $query_vars ), $redirect );
+                }
+        }
+
+        return $redirect;
+}
+
+function _bp_rewrites_get_blogs_url( $link = '' ) {
+        return bp_rewrites_get_link( array(
+                'component_id' => 'blogs',
+        ) );
+}
+
+function _bp_rewrites_get_blog_create_url( $link = '' ) {
+        return bp_rewrites_get_link( array(
+                'component_id'       => 'blogs',
+                'single_item_action' => 'create',
+        ) );
+}
+
+function _bp_rewrites_xprofile_group_edit_url( $link = '', $field_group_id = 0 ) {
+        if ( ! $field_group_id ) {
+                return $link;
+        }
+
+        return bp_rewrites_get_link( array(
+                'component_id'                 => 'members',
+                'single_item'                  => bp_rewrites_get_member_slug( bp_displayed_user_id() ),
+                'single_item_component'        => bp_rewrites_get_slug( 'members', 'bp_member_profile', bp_get_profile_slug() ),
+                'single_item_action'           => 'edit',
+                'single_item_action_variables' => array( 'group', $field_group_id ),
+        ) );
+}

src/bp-core/bp-core-taxonomy.php

@@ -22 +22 @@
 function bp_register_default_taxonomies() {
         // Member Type.
         register_taxonomy( bp_get_member_type_tax_name(), 'user', array(
-                'public' => false,
+                'public'  => false,
+                /**
+                 * Prevents WordPress Taxonomy rewrite rules to be automaticaly generated.
+                 * Rewrite rules for the Member Type Taxonomy is handled within the Members
+                 * component class {@see BP_Members_Component::add_rewrite_rules()}}.
+                 */
+                'rewrite' => false,
         ) );
 
         // Email type.

src/bp-core/bp-core-template-loader.php

@@ -469 +469 @@
  * @param WP_Query $posts_query WP_Query object.
  */
 function bp_parse_query( $posts_query ) {
+        $bp_is_doing_ajax = isset( buddypress()->ajax->WP );
 
-        // Bail if $posts_query is not the main loop.
-        if ( ! $posts_query->is_main_query() ) {
+        // Bail if $posts_query is not the main loop and not done in BP Ajax context.
+        if ( ! $bp_is_doing_ajax && ! $posts_query->is_main_query() ) {
                 return;
         }
 
@@ -480 +481 @@
                 return;
         }
 
-        // Bail if in admin.
-        if ( is_admin() ) {
+        // Bail if in admin and not done in BP Ajax context.
+        if ( ! $bp_is_doing_ajax && is_admin() ) {
                 return;
         }
 

src/bp-core/classes/class-bp-admin.php

@@ -123 +123 @@
                 require( $this->admin_dir . 'bp-core-admin-components.php' );
                 require( $this->admin_dir . 'bp-core-admin-slugs.php'      );
                 require( $this->admin_dir . 'bp-core-admin-tools.php'      );
+                require $this->admin_dir . 'bp-core-admin-rewrites.php';
         }
 
         /**
@@ -234 +235 @@
                         'bp_core_admin_components_settings'
                 );
 
-                $hooks[] = add_submenu_page(
-                        $this->settings_page,
-                        __( 'BuddyPress Pages', 'buddypress' ),
-                        __( 'BuddyPress Pages', 'buddypress' ),
-                        $this->capability,
-                        'bp-page-settings',
-                        'bp_core_admin_slugs_settings'
-                );
+                if ( bp_use_wp_rewrites() ) {
+                        $hooks[] = add_submenu_page(
+                                $this->settings_page,
+                                __( 'BuddyPress URLs', 'buddypress' ),
+                                __( 'BuddyPress URLs', 'buddypress' ),
+                                $this->capability,
+                                'bp-rewrites-settings',
+                                'bp_core_admin_rewrites_settings'
+                        );
+                } else {
+                        $hooks[] = add_submenu_page(
+                                $this->settings_page,
+                                __( 'BuddyPress Pages', 'buddypress' ),
+                                __( 'BuddyPress Pages', 'buddypress' ),
+                                $this->capability,
+                                'bp-page-settings',
+                                'bp_core_admin_slugs_settings'
+                        );
+                }
 
                 $hooks[] = add_submenu_page(
                         $this->settings_page,
@@ -394 +406 @@
                 add_settings_field( '_bp_theme_package_id', __( 'Template Pack', 'buddypress' ), 'bp_admin_setting_callback_theme_package_id', 'buddypress', 'bp_main', array( 'label_for' => '_bp_theme_package_id' ) );
                 register_setting( 'buddypress', '_bp_theme_package_id', 'sanitize_text_field' );
 
+                // Rewrites.
+                add_settings_field( '_bp_use_wp_rewrites', __( 'Custom URLs', 'buddypress' ), 'bp_admin_setting_callback_use_wp_rewrites', 'buddypress', 'bp_main', array( 'label_for' => '_bp_use_wp_rewrites' ) );
+                register_setting( 'buddypress', '_bp_use_wp_rewrites', 'intval' );
+
                 /* XProfile Section **************************************************/
 
                 if ( bp_is_active( 'xprofile' ) ) {
@@ -516 +532 @@
         public function admin_head() {
 
                 // Settings pages.
-                remove_submenu_page( $this->settings_page, 'bp-page-settings' );
-                remove_submenu_page( $this->settings_page, 'bp-settings'      );
-                remove_submenu_page( $this->settings_page, 'bp-credits'       );
+                remove_submenu_page( $this->settings_page, 'bp-page-settings'     );
+                remove_submenu_page( $this->settings_page, 'bp-settings'          );
+                remove_submenu_page( $this->settings_page, 'bp-credits'           );
+                remove_submenu_page( $this->settings_page, 'bp-rewrites-settings' );
 
                 // Network Admin Tools.
                 remove_submenu_page( 'network-tools', 'network-tools' );

src/bp-core/classes/class-bp-component.php

@@ -236 +236 @@
                         'slug'                  => $this->id,
                         'root_slug'             => $default_root_slug,
                         'has_directory'         => false,
+                        'rewrite_ids'           => array(),
                         'directory_title'       => '',
                         'notification_callback' => '',
                         'search_string'         => '',
@@ -261 +262 @@
                  */
                 $this->root_slug             = apply_filters( 'bp_' . $this->id . '_root_slug',             $r['root_slug']             );
 
+                /**
+                 * Filters the component's rewrite IDs if available.
+                 *
+                 * @since 6.0.0
+                 *
+                 * @param array $value The list of rewrite IDs of the component.
+                 */
+                $this->rewrite_ids           = apply_filters( 'bp_' . $this->id . '_rewrite_ids',           $r['rewrite_ids']           );
+
                 /**
                  * Filters the component's top-level directory if available.
                  *
@@ -270 +280 @@
                  */
                 $this->has_directory         = apply_filters( 'bp_' . $this->id . '_has_directory',         $r['has_directory']         );
 
+                // Set the component's directory permastruct early so that it's available to build links.
+                if ( $this->has_directory && isset( $this->rewrite_ids['directory'] ) ) {
+                        $this->directory_permastruct = $this->root_slug . '/%' . $this->rewrite_ids['directory'] . '%';
+                }
+
                 /**
                  * Filters the component's directory title.
                  *
@@ -768 +783 @@
          * Add any additional rewrite tags.
          *
          * @since 1.5.0
+         * @since 6.0.0 Added the `$rewrite_tags` parameter.
+         *
+         * @param array $rewrite tags {
+         *      Associative array of arguments list used to register WordPress permastructs.
+         *      The main array keys describe the rules type and allow individual edits if needed.
          *
+         *      @type string $id    The name of the new rewrite tag. Required.
+         *      @type string $regex The regular expression to substitute the tag for in rewrite rules.
+         *                          Required.
+         * }
          */
-        public function add_rewrite_tags() {
+        public function add_rewrite_tags( $rewrite_tags = array() ) {
+                if ( $rewrite_tags ) {
+                        foreach ( (array) $rewrite_tags as $rewrite_tag ) {
+                                if ( ! isset( $rewrite_tag['id'] ) || ! isset( $rewrite_tag['regex'] ) ) {
+                                        continue;
+                                }
+
+                                add_rewrite_tag( $rewrite_tag['id'], $rewrite_tag['regex'] );
+                        }
+                }
 
                 /**
                  * Fires in the add_rewrite_tags method inside BP_Component.
@@ -786 +819 @@
          * Add any additional rewrite rules.
          *
          * @since 1.9.0
+         * @since 6.0.0 Added the `$rewrite_rules` parameter.
+         *
+         * @param array $rewrite_rules {
+         *      Associative array of arguments list used to register WordPress permastructs.
+         *      The main array keys describe the rules type and allow individual edits if needed.
          *
+         *      @type string $regex    Regular expression to match request against. Required.
+         *      @type string $query    The corresponding query vars for this rewrite rule. Required.
+         *      @type string $priority The Priority of the new rule. Accepts 'top' or 'bottom'. Optional.
+         *                             Default 'top'.
+         * }
          */
-        public function add_rewrite_rules() {
+        public function add_rewrite_rules( $rewrite_rules = array() ) {
+                $priority = 'top';
+
+                if ( $rewrite_rules ) {
+                        foreach ( $rewrite_rules as $rewrite_rule ) {
+                                if ( ! isset( $rewrite_rule['regex'] ) || ! isset( $rewrite_rule['query'] ) ) {
+                                        continue;
+                                }
+
+                                if ( ! isset( $rewrite_rule['priority'] ) || ! ! $rewrite_rule['priority'] ) {
+                                        $rewrite_rule['priority'] = $priority;
+                                }
+
+                                add_rewrite_rule( $rewrite_rule['regex'], $rewrite_rule['query'], $rewrite_rule['priority'] );
+                        }
+                }
 
                 /**
                  * Fires in the add_rewrite_rules method inside BP_Component.
@@ -804 +862 @@
          * Add any permalink structures.
          *
          * @since 1.9.0
+         * @since 6.0.0 Added the `$structs` parameter.
          *
+         * @param array $structs {
+         *      Associative array of arguments list used to register WordPress permastructs.
+         *      The main array keys hold the name argument of the `add_permastruct()` function.
+         *
+         *      @type string $struct The permalink structure. Required.
+         *      @type array  $args   The permalink structure arguments. Optional
+         * }
          */
-        public function add_permastructs() {
+        public function add_permastructs( $structs = array() ) {
+                if ( ! $structs ) {
+                        return;
+                }
+
+                foreach ( (array) $structs as $name => $params ) {
+                        if ( ! $name || ! isset( $params['struct'] ) || ! $params['struct'] ) {
+                                continue;
+                        }
+
+                        if ( ! $params['args'] ) {
+                                $params['args'] = array();
+                        }
+
+                        $args = wp_parse_args( $params['args'], array(
+                                'with_front'  => false,
+                                'ep_mask'     => EP_NONE,
+                                'paged'       => true,
+                                'feed'        => false,
+                                'forcomments' => false,
+                                'walk_dirs'   => true,
+                                'endpoints'   => false,
+                        ) );
+
+                        // Add the permastruct.
+                        add_permastruct( $name, $params['struct'], $args );
+                }
 
                 /**
                  * Fires in the add_permastructs method inside BP_Component.
@@ -824 +916 @@
          * @since 1.9.0
          *
          *
-         * @param object $query The main WP_Query.
+         * @param WP_Query $query The main WP_Query.
          */
-        public function parse_query( $query ) {
+        public function parse_query( WP_Query $query ) {
+                if ( bp_use_wp_rewrites() && is_buddypress() ) {
+                        add_filter( 'posts_pre_query', array( $this, 'posts_pre_query' ), 10, 2 );
+                }
 
                 /**
                  * Fires in the parse_query method inside BP_Component.
@@ -835 +930 @@
                  *
                  * @since 1.9.0
                  *
-                 * @param object $query Main WP_Query object. Passed by reference.
+                 * @param WP_Query $query Main WP_Query object. Passed by reference.
                  */
                 do_action_ref_array( 'bp_' . $this->id . '_parse_query', array( &$query ) );
         }
 
+        /**
+         * Make sure to avoid querying for regular posts when displaying a BuddyPress page.
+         *
+         * @since 6.0.0
+         *
+         * @param  null       $return A null value to use the regular WP Query.
+         * @param  WP_Query   $query  The WP Query object.
+         * @return null|array         Null if not displaying a BuddyPress page.
+         *                            An array containing the BuddyPress directory Post otherwise.
+         */
+        public function posts_pre_query( $return = null, WP_Query $query ) {
+                remove_filter( 'posts_pre_query', array( $this, 'posts_pre_query' ), 10, 2 );
+
+                $queried_object = $query->get_queried_object();
+
+                if ( is_a( $queried_object, 'WP_Post' ) && 'bp_directories' === get_post_type( $queried_object ) ) {
+                        return array( $queried_object );
+                }
+
+                return null;
+        }
+
         /**
          * Generate any additional rewrite rules.
          *

src/bp-friends/classes/class-bp-friends-component.php

@@ -186 +186 @@
                         'position'            => 60,
                         'screen_function'     => 'friends_screen_my_friends',
                         'default_subnav_slug' => 'my-friends',
-                        'item_css_id'         => $this->id
+                        'item_css_id'         => $this->id,
+                        'rewrite_id'          => 'bp_member_' . $slug,
                 );
 
                 // Add the subnav items to the friends nav item.

src/bp-groups/actions/create.php

@@ -44 +44 @@
 
                 $reset_steps = true;
                 $keys        = array_keys( $bp->groups->group_creation_steps );
-                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . array_shift( $keys ) ) );
+                bp_core_redirect( bp_get_group_create_link( array_shift( $keys ) ) );
         }
 
         // If this is a creation step that is not recognized, just redirect them back to the first screen.
         if ( bp_get_groups_current_create_step() && empty( $bp->groups->group_creation_steps[bp_get_groups_current_create_step()] ) ) {
                 bp_core_add_message( __('There was an error saving group details. Please try again.', 'buddypress'), 'error' );
-                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create' ) );
+                bp_core_redirect( bp_get_group_create_link() );
         }
 
         // Fetch the currently completed steps variable.
@@ -64 +64 @@
                 // Only allow the group creator to continue to edit the new group.
                 if ( ! bp_is_group_creator( $bp->groups->current_group, bp_loggedin_user_id() ) ) {
                         bp_core_add_message( __( 'Only the group creator may continue editing this group.', 'buddypress' ), 'error' );
-                        bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create' ) );
+                        bp_core_redirect( bp_get_group_create_link() );
                 }
         }
 
@@ -77 +77 @@
                 if ( 'group-details' == bp_get_groups_current_create_step() ) {
                         if ( empty( $_POST['group-name'] ) || empty( $_POST['group-desc'] ) || !strlen( trim( $_POST['group-name'] ) ) || !strlen( trim( $_POST['group-desc'] ) ) ) {
                                 bp_core_add_message( __( 'Please fill in all of the required fields', 'buddypress' ), 'error' );
-                                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . bp_get_groups_current_create_step() ) );
+                                bp_core_redirect( bp_get_group_create_link( bp_get_groups_current_create_step() ) );
                         }
 
                         $new_group_id = isset( $bp->groups->new_group_id ) ? $bp->groups->new_group_id : 0;
 
                         if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title( esc_attr( $_POST['group-name'] ) ) ), 'date_created' => bp_core_current_time(), 'status' => 'public' ) ) ) {
                                 bp_core_add_message( __( 'There was an error saving group details. Please try again.', 'buddypress' ), 'error' );
-                                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . bp_get_groups_current_create_step() ) );
+                                bp_core_redirect( bp_get_group_create_link( bp_get_groups_current_create_step() ) );
                         }
                 }
 
@@ -103 +103 @@
 
                         if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_forum' => $group_enable_forum ) ) ) {
                                 bp_core_add_message( __( 'There was an error saving group details. Please try again.', 'buddypress' ), 'error' );
-                                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . bp_get_groups_current_create_step() ) );
+                                bp_core_redirect( bp_get_group_create_link( bp_get_groups_current_create_step() ) );
                         }
 
                         // Save group types.
@@ -216 +216 @@
                                 }
                         }
 
-                        bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . $next_step ) );
+                        bp_core_redirect( bp_get_group_create_link( $next_step ) );
                 }
         }
 
@@ -235 +235 @@
                 }
 
                 bp_core_add_message( $message, $error );
-                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/group-invites' ) );
+                bp_core_redirect( bp_get_group_create_link( 'group-invites' ) );
         }
 
         // Group avatar is handled separately.
@@ -337 +337 @@
          * @since 2.3.0
          */
         do_action( 'groups_action_sort_creation_steps' );
-}
- No newline at end of file
+}

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

@@ -121 +121 @@
                 return apply_filters( 'bp_get_groups_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ) );
         }
 
+/**
+ * Output the create group link.
+ *
+ * @since 6.0.0
+ *
+ * @param string $step The group creation step name.
+ */
+function bp_group_create_link( $step = '' ) {
+        echo esc_url( bp_get_group_create_link( $step ) );
+}
+
+        /**
+         * Return the create group link.
+         *
+         * @since 6.0.0
+         *
+         * @param  string $step The group creation step name.
+         * @return string
+         */
+        function bp_get_group_create_link( $step = '' ) {
+                $link = trailingslashit( bp_get_groups_directory_permalink() . 'create' );
+
+                if ( $step ) {
+                        $link = trailingslashit( $link . 'step/' . $step );
+                }
+
+                /**
+                 * Filters the create group link.
+                 *
+                 * @since 6.0.0
+                 *
+                 * @param string $link The create group link.
+                 * @param string $step The group creation step name.
+                 */
+                return apply_filters( 'bp_get_group_create_link', $link, $step );
+        }
+
 /**
  * Output group type directory permalink.
  *
@@ -2908 +2945 @@
                  *
                  * @since 1.0.0
                  * @since 2.5.0 Added the `$group` parameter.
+                 * @since 6.0.0 Added the `$page` parameter.
                  *
                  * @param string $value Action attribute for a group admin form.
                  * @param object $group Group object.
+                 * @param string $page  The Admin page slug.
                  */
-                return apply_filters( 'bp_group_admin_form_action', trailingslashit( bp_get_group_permalink( $group ) . 'admin/' . $page ), $group );
+                return apply_filters( 'bp_group_admin_form_action', trailingslashit( bp_get_group_permalink( $group ) . 'admin/' . $page ), $group, $page );
         }
 
 /**
@@ -3449 +3488 @@
                         'component'  => 'groups',
                         'link_text'  => __( 'Create a Group', 'buddypress' ),
                         'link_class' => 'group-create no-ajax',
-                        'link_href'  => trailingslashit( bp_get_groups_directory_permalink() . 'create' ),
+                        'link_href'  => bp_get_group_create_link(),
                         'wrapper'    => false,
                         'block_self' => false,
                 );
@@ -4546 +4585 @@
         function bp_get_group_creation_form_action() {
                 $bp = buddypress();
 
-                if ( !bp_action_variable( 1 ) ) {
+                if ( ! bp_action_variable( 1 ) ) {
                         $keys = array_keys( $bp->groups->group_creation_steps );
                         $bp->action_variables[1] = array_shift( $keys );
                 }
@@ -4558 +4597 @@
                  *
                  * @param string $value Action to be used with group creation form.
                  */
-                return apply_filters( 'bp_get_group_creation_form_action', trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . bp_action_variable( 1 ) ) );
+                return apply_filters( 'bp_get_group_creation_form_action', bp_get_group_create_link( bp_action_variable( 1 ) ) );
         }
 
 /**

src/bp-groups/classes/class-bp-groups-component.php

@@ -212 +212 @@
                 }
         }
 
+        /**
+         * Get the current Group object using its slug.
+         *
+         * @since 6.0.0
+         *
+         * @param  string               $group_slug The Group slug used into the URL path.
+         * @return int|BP_Groups_Group  The current group found. 0 otherwise.
+         */
+        public function get_current_group( $group_slug = '' ) {
+                if ( ! bp_is_groups_component() || ! $group_slug ) {
+                        return 0;
+                }
+
+                // Get the BuddyPress main instance.
+                $bp = buddypress();
+
+                // Try to find a group ID matching the requested slug.
+                $group_id = BP_Groups_Group::group_exists( $group_slug );
+                if ( ! $group_id ) {
+                        $group_id = BP_Groups_Group::get_id_by_previous_slug( $group_slug );
+                }
+
+                // The Group was not found?
+                if ( ! $group_id ) {
+                        return 0;
+                }
+
+                // Set the single item and init the current group.
+                $bp->is_single_item  = true;
+                $current_group       = 0;
+
+                /**
+                 * Filters the current PHP Class being used.
+                 *
+                 * @since 1.5.0
+                 *
+                 * @param string $value Name of the class being used.
+                 */
+                $current_group_class = apply_filters( 'bp_groups_current_group_class', 'BP_Groups_Group' );
+
+                if ( $current_group_class == 'BP_Groups_Group' ) {
+                        $current_group = groups_get_group( $group_id );
+
+                } else {
+
+                        /**
+                         * Filters the current group object being instantiated from previous filter.
+                         *
+                         * @since 1.5.0
+                         *
+                         * @param object $value Newly instantiated object for the group.
+                         */
+                        $current_group = apply_filters( 'bp_groups_current_group_object', new $current_group_class( $group_id ) );
+                }
+
+                // We have a group let's add some other usefull things.
+                if ( $current_group ) {
+                        // Using "item" not "group" for generic support in other components.
+                        if ( bp_current_user_can( 'bp_moderate' ) ) {
+                                bp_update_is_item_admin( true, 'groups' );
+                        } else {
+                                bp_update_is_item_admin( groups_is_user_admin( bp_loggedin_user_id(), $current_group->id ), 'groups' );
+                        }
+
+                        // If the user is not an admin, check if they are a moderator.
+                        if ( ! bp_is_item_admin() ) {
+                                bp_update_is_item_mod( groups_is_user_mod( bp_loggedin_user_id(), $current_group->id ), 'groups' );
+                        }
+
+                        // Check once if the current group has a custom front template.
+                        $current_group->front_template = bp_groups_get_front_template( $current_group );
+
+                        // Initialize the nav for the groups component.
+                        $this->nav = new BP_Core_Nav( $current_group->id );
+                }
+
+                return $current_group;
+        }
+
         /**
          * Set up component global data.
          *
@@ -254 +333 @@
                         'slug'                  => BP_GROUPS_SLUG,
                         'root_slug'             => isset( $bp->pages->groups->slug ) ? $bp->pages->groups->slug : BP_GROUPS_SLUG,
                         'has_directory'         => true,
+                        'rewrite_ids'     => array(
+                                'directory'                    => 'bp_groups',
+                                'directory_type'               => 'bp_groups_type',
+                                'create_single_item'           => 'bp_group_create',
+                                'create_single_item_variables' => 'bp_group_create_variables',
+                                'single_item'                  => 'bp_group',
+                                'single_item_action'           => 'bp_group_action',
+                                'single_item_action_variables' => 'bp_group_action_variables',
+                        ),
                         'directory_title'       => isset( $bp->pages->groups->title ) ? $bp->pages->groups->title : $default_directory_title,
                         'notification_callback' => 'groups_format_notifications',
                         'search_string'         => _x( 'Search Groups...', 'Component directory search', 'buddypress' ),
@@ -266 +354 @@
                 /* Single Group Globals **********************************************/
 
                 // Are we viewing a single group?
-                if ( bp_is_groups_component()
-                        && ( ( $group_id = BP_Groups_Group::group_exists( bp_current_action() ) )
-                                || ( $group_id = BP_Groups_Group::get_id_by_previous_slug( bp_current_action() ) ) )
-                        ) {
-                        $bp->is_single_item  = true;
+                $this->current_group = $this->get_current_group( bp_current_action() );
 
+                if ( $this->current_group ) {
                         /**
-                         * Filters the current PHP Class being used.
-                         *
-                         * @since 1.5.0
-                         *
-                         * @param string $value Name of the class being used.
+                         * When in a single group, the first action is bumped down one because of the
+                         * group name, so we need to adjust this and set the group name to current_item.
                          */
-                        $current_group_class = apply_filters( 'bp_groups_current_group_class', 'BP_Groups_Group' );
-
-                        if ( $current_group_class == 'BP_Groups_Group' ) {
-                                $this->current_group = groups_get_group( $group_id );
-
-                        } else {
-
-                                /**
-                                 * Filters the current group object being instantiated from previous filter.
-                                 *
-                                 * @since 1.5.0
-                                 *
-                                 * @param object $value Newly instantiated object for the group.
-                                 */
-                                $this->current_group = apply_filters( 'bp_groups_current_group_object', new $current_group_class( $group_id ) );
-                        }
-
-                        // When in a single group, the first action is bumped down one because of the
-                        // group name, so we need to adjust this and set the group name to current_item.
                         $bp->current_item   = bp_current_action();
                         $bp->current_action = bp_action_variable( 0 );
                         array_shift( $bp->action_variables );
-
-                        // Using "item" not "group" for generic support in other components.
-                        if ( bp_current_user_can( 'bp_moderate' ) ) {
-                                bp_update_is_item_admin( true, 'groups' );
-                        } else {
-                                bp_update_is_item_admin( groups_is_user_admin( bp_loggedin_user_id(), $this->current_group->id ), 'groups' );
-                        }
-
-                        // If the user is not an admin, check if they are a moderator.
-                        if ( ! bp_is_item_admin() ) {
-                                bp_update_is_item_mod  ( groups_is_user_mod  ( bp_loggedin_user_id(), $this->current_group->id ), 'groups' );
-                        }
-
-                        // Check once if the current group has a custom front template.
-                        $this->current_group->front_template = bp_groups_get_front_template( $this->current_group );
-
-                        // Initialize the nav for the groups component.
-                        $this->nav = new BP_Core_Nav( $this->current_group->id );
-
-                // Set current_group to 0 to prevent debug errors.
-                } else {
-                        $this->current_group = 0;
                 }
 
                 // Set group type if available.
@@ -548 +589 @@
                         'position'            => 70,
                         'screen_function'     => 'groups_screen_my_groups',
                         'default_subnav_slug' => 'my-groups',
-                        'item_css_id'         => $this->id
+                        'item_css_id'         => $this->id,
+                        'rewrite_id'          => 'bp_member_' . $slug,
                 );
 
                 if ( ! empty( $user_domain ) ) {
@@ -839 +881 @@
                                         'parent'   => 'my-account-' . $this->id,
                                         'id'       => 'my-account-' . $this->id . '-create',
                                         'title'    => _x( 'Create a Group', 'My Account Groups sub nav', 'buddypress' ),
-                                        'href'     => trailingslashit( bp_get_groups_directory_permalink() . 'create' ),
+                                        'href'     => bp_get_group_create_link(),
                                         'position' => 90
                                 );
                         }
@@ -919 +961 @@
                 // Group Type.
                 register_taxonomy( 'bp_group_type', 'bp_group', array(
                         'public' => false,
+                        /**
+                         * Prevents WordPress Taxonomy rewrite rules to be automaticaly generated.
+                         * Rewrite rules for the Group Type Taxonomy is handled within the Groups
+                         * component class {@see BP_Groups_Component::add_rewrite_rules()}}.
+                         */
+                        'rewrite' => false,
                 ) );
         }
+
+        /**
+         * Add the component's rewrite tags.
+         *
+         * @since 6.0.0
+         *
+         * @param array $rewrite_tags Optional. See BP_Component::add_rewrite_tags() for
+         *                            description.
+         */
+        public function add_rewrite_tags( $rewrite_tags = array() ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::add_rewrite_tags( $rewrite_tags );
+                }
+
+                $rewrite_tags = array(
+                        'directory' => array(
+                                'id'    => '%' . $this->rewrite_ids['directory'] . '%',
+                                'regex' => '([1]{1,})',
+                        ),
+                        'directory-type' => array(
+                                'id'    => '%' . $this->rewrite_ids['directory_type'] . '%',
+                                'regex' => '([^/]+)',
+                        ),
+                        'create-single-item' => array(
+                                'id'      => '%' . $this->rewrite_ids['create_single_item'] . '%',
+                                'regex'   => '([1]{1,})',
+                        ),
+                        'create-single-item-variables' => array(
+                                'id'      => '%' . $this->rewrite_ids['create_single_item_variables'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                        'single-item' => array(
+                                'id'      => '%' . $this->rewrite_ids['single_item'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                        'single-item-action' => array(
+                                'id'      => '%' . $this->rewrite_ids['single_item_action'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                        'single-item-action-variables' => array(
+                                'id'      => '%' . $this->rewrite_ids['single_item_action_variables'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                );
+
+                parent::add_rewrite_tags( $rewrite_tags );
+        }
+
+        /**
+         * Add the component's rewrite rules.
+         *
+         * @since 6.0.0
+         *
+         * @param array $rewrite_rules Optional. See BP_Component::add_rewrite_rules() for
+         *                             description.
+         */
+        public function add_rewrite_rules( $rewrite_rules = array() ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::add_rewrite_rules( $rewrite_rules );
+                }
+
+                $rewrite_rules = array(
+                        'create-single-item-variables' => array(
+                                'regex' => $this->root_slug . '/create\/(.+?)/?$' ,
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['create_single_item'] . '=1&' . $this->rewrite_ids['create_single_item_variables'] . '=$matches[1]',
+                        ),
+                        'create-single-item' => array(
+                                'regex' => $this->root_slug . '/create/?$' ,
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['create_single_item'] . '=1',
+                        ),
+                        'paged-directory-type' => array(
+                                'regex' => $this->root_slug . '/' . bp_get_groups_group_type_base() . '/([^/]+)/page/?([0-9]{1,})/?$' ,
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['directory_type'] . '=$matches[1]&paged=$matches[2]',
+                        ),
+                        'directory-type' => array(
+                                'regex' => $this->root_slug . '/' . bp_get_groups_group_type_base() . '/([^/]+)/?$' ,
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['directory_type'] . '=$matches[1]',
+                        ),
+                        'paged-directory' => array(
+                                'regex' => $this->root_slug . '/page/?([0-9]{1,})/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&paged=$matches[1]',
+                        ),
+                        'single-item-action-variables' => array(
+                                'regex' => $this->root_slug . '/([^/]+)\/([^/]+)\/(.+?)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['single_item'] . '=$matches[1]&' . $this->rewrite_ids['single_item_action'] . '=$matches[2]&' . $this->rewrite_ids['single_item_action_variables'] . '=$matches[3]',
+                        ),
+                        'single-item-action' => array(
+                                'regex' => $this->root_slug . '/([^/]+)\/([^/]+)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['single_item'] . '=$matches[1]&' . $this->rewrite_ids['single_item_action'] . '=$matches[2]',
+                        ),
+                        'single-item' => array(
+                                'regex' => $this->root_slug . '/([^/]+)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['single_item'] . '=$matches[1]',
+                        ),
+                        'directory' => array(
+                                'regex' => $this->root_slug,
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1',
+                        ),
+                );
+
+                parent::add_rewrite_rules( $rewrite_rules );
+        }
+
+        /**
+         * Add the component's directory permastructs.
+         *
+         * @since 6.0.0
+         *
+         * @param array $structs Optional. See BP_Component::add_permastructs() for
+         *                       description.
+         */
+        public function add_permastructs( $structs = array() ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::add_permastructs( $structs );
+                }
+
+                $permastructs = array(
+                        // Directory permastruct.
+                        $this->rewrite_ids['directory'] => array(
+                                'struct' => $this->directory_permastruct,
+                                'args'   => array(),
+                        ),
+                );
+
+                parent::add_permastructs( $permastructs );
+        }
+
+        /**
+         * Parse the WP_Query and eventually display the component's directory or single item.
+         *
+         * @since 6.0.0
+         *
+         * @param WP_Query $query Required. See BP_Component::parse_query() for
+         *                        description.
+         */
+        public function parse_query( WP_Query $query ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::parse_query( $query );
+                }
+
+                $is_groups_component = 1 === (int) $query->get( $this->rewrite_ids['directory'] );
+                $bp                  = buddypress();
+                $group_type          = false;
+
+                if ( $is_groups_component ) {
+                        $bp->current_component = 'groups';
+                        $group_slug            = $query->get( $this->rewrite_ids['single_item'] );
+                        $group_type_slug       = $query->get( $this->rewrite_ids['directory_type'] );
+                        $is_group_create       = 1 === (int) $query->get( $this->rewrite_ids['create_single_item'] );
+
+                        if ( $group_slug ) {
+                                $this->current_group = $this->get_current_group( $group_slug );
+
+                                if ( ! $this->current_group ) {
+                                        bp_do_404();
+                                        return;
+                                }
+
+                                // Set the current item using the group slug.
+                                $bp->current_item = $group_slug;
+
+                                $current_action = $query->get( $this->rewrite_ids['single_item_action'] );
+                                if ( $current_action ) {
+                                        $bp->current_action = $current_action;
+                                }
+
+                                $action_variables = $query->get( $this->rewrite_ids['single_item_action_variables'] );
+                                if ( $action_variables ) {
+                                        if ( ! is_array( $action_variables ) )  {
+                                                $bp->action_variables = explode( '/', ltrim( $action_variables, '/' ) );
+                                        } else {
+                                                $bp->action_variables = $action_variables;
+                                        }
+                                }
+                        } elseif ( $group_type_slug ) {
+                                $group_type = bp_groups_get_group_types( array(
+                                        'has_directory'  => true,
+                                        'directory_slug' => $group_type_slug,
+                                ) );
+
+                                if ( $group_type ) {
+                                        $group_type                   = reset( $group_type );
+                                        $this->current_directory_type = $group_type;
+                                        $bp->current_action           = bp_get_groups_group_type_base();
+                                        $bp->action_variables         = array( $group_type_slug );
+                                } else {
+                                        bp_do_404();
+                                        return;
+                                }
+                        } elseif ( $is_group_create ) {
+                                $bp->current_action = 'create';
+
+                                if ( bp_user_can_create_groups() && isset( $_COOKIE['bp_new_group_id'] ) ) {
+                                        $bp->groups->new_group_id = (int) $_COOKIE['bp_new_group_id'];
+                                }
+
+                                $create_variables = $query->get( $this->rewrite_ids['create_single_item_variables'] );
+                                if ( $create_variables ) {
+                                        if ( ! is_array( $create_variables ) )  {
+                                                $bp->action_variables = explode( '/', ltrim( $create_variables, '/' ) );
+                                        } else {
+                                                $bp->action_variables = $create_variables;
+                                        }
+                                }
+                        }
+
+                        /**
+                         * Set the BuddyPress queried object.
+                         */
+                        $query->queried_object    = get_post( $bp->pages->groups->id );
+                        $query->queried_object_id = $query->queried_object->ID;
+
+                        if ( $this->current_group ) {
+                                $query->queried_object->single_item_name = $this->current_group->name;
+                        } elseif ( $group_type ) {
+                                $query->queried_object->directory_type_name = $group_type;
+                        }
+                }
+
+                parent::parse_query( $query );
+        }
 }

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

@@ -13 +13 @@
  * @since 1.0.0
  */
 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/' );
-}
- No newline at end of file
+        bp_core_redirect( bp_get_group_admin_form_action( 'edit-details', groups_get_current_group() ) );
+}

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

@@ -53 +53 @@
                          */
                         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/' );
+                        bp_core_redirect( bp_get_group_admin_form_action( 'edit-details', groups_get_current_group() ) );
                 }
 
                 /**
@@ -75 +75 @@
                 bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/single/home' ) );
         }
 }
-add_action( 'bp_screens', 'groups_screen_group_admin_edit_details' );
- No newline at end of file
+add_action( 'bp_screens', 'groups_screen_group_admin_edit_details' );

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

@@ -2173 +2173 @@
 function bp_core_signup_send_validation_email( $user_id, $user_email, $key, $salutation = '' ) {
         $args = array(
                 'tokens' => array(
-                        'activate.url' => esc_url( trailingslashit( bp_get_activation_page() ) . "{$key}/" ),
+                        'activate.url' => esc_url( trailingslashit( bp_get_activation_page( $key ) ) ),
                         'key'          => $key,
                         'user.email'   => $user_email,
                         'user.id'      => $user_id,

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

@@ -1478 +1478 @@
                         $selected = ' class="current selected"';
                 }
 
-                if ( bp_loggedin_user_domain() ) {
-                        $link = str_replace( bp_loggedin_user_domain(), bp_displayed_user_domain(), $user_nav_item->link );
+                /**
+                 * Rewrites directly set the displayed user link. This substitution is
+                 * only required when BuddyPress is using the legacy URL parser.
+                 */
+                if ( ! bp_use_wp_rewrites() ) {
+                        if ( bp_loggedin_user_domain() ) {
+                                $link = str_replace( bp_loggedin_user_domain(), bp_displayed_user_domain(), $user_nav_item->link );
+                        } else {
+                                $link = trailingslashit( bp_displayed_user_domain() . $user_nav_item->link );
+                        }
                 } else {
-                        $link = trailingslashit( bp_displayed_user_domain() . $user_nav_item->link );
+                        $link = $user_nav_item->link;
                 }
 
                 /**
@@ -2089 +2097 @@
  * Output the URL of the activation page.
  *
  * @since 1.0.0
+ * @since 6.0.0 Added the `$key` parameter.
+ *
+ * @param string $key The activation key.
  */
-function bp_activation_page() {
-        echo esc_url( bp_get_activation_page() );
+function bp_activation_page( $key = '' ) {
+        echo esc_url( bp_get_activation_page( $key ) );
 }
         /**
          * Get the URL of the activation page.
          *
          * @since 1.2.0
+         * @since 6.0.0 Added the `$key` parameter.
          *
+         * @param string $key The activation key.
          * @return string
          */
-        function bp_get_activation_page() {
-                if ( bp_has_custom_activation_page() ) {
+        function bp_get_activation_page( $key = '' ) {
+                $has_custom_activation_page = bp_has_custom_activation_page();
+
+                if ( $has_custom_activation_page ) {
                         $page = trailingslashit( bp_get_root_domain() . '/' . bp_get_activate_slug() );
+
+                        if ( $key ) {
+                                $page .= $key . '/';
+                        }
                 } else {
                         $page = trailingslashit( bp_get_root_domain() ) . 'wp-activate.php';
+
+                        if ( $key ) {
+                                $page = add_query_arg( 'key', $key, $page );
+                        }
                 }
 
                 /**
                  * Filters the URL of the activation page.
                  *
                  * @since 1.2.0
+                 * @since 6.0.0 Added the `$key` & `$has_custom_activation_page` parameters.
                  *
-                 * @param string $page URL to the activation page.
+                 * @param string $page                       URL to the activation page.
+                 * @param string $key                        The activation key.
+                 * @param bool   $has_custom_activation_page Whether the site has a custom activation
+                 *                                           page or not.
                  */
-                return apply_filters( 'bp_get_activation_page', $page );
+                return apply_filters( 'bp_get_activation_page', $page, $key, $has_custom_activation_page );
         }
 
 /**

src/bp-members/classes/class-bp-members-component.php

@@ -160 +160 @@
                         'slug'            => BP_MEMBERS_SLUG,
                         'root_slug'       => isset( $bp->pages->members->slug ) ? $bp->pages->members->slug : BP_MEMBERS_SLUG,
                         'has_directory'   => true,
+                        'rewrite_ids'     => array(
+                                'directory'                    => 'bp_members',
+                                'directory_type'               => 'bp_members_type',
+                                'single_item'                  => 'bp_member',
+                                'single_item_component'        => 'bp_member_component',
+                                'single_item_action'           => 'bp_member_action',
+                                'single_item_action_variables' => 'bp_member_action_variables',
+                                'member_register'              => 'bp_register',
+                                'member_activate'              => 'bp_activate',
+                                'member_activate_key'          => 'bp_activate_key',
+                        ),
                         'directory_title' => isset( $bp->pages->members->title ) ? $bp->pages->members->title : $default_directory_title,
                         'search_string'   => __( 'Search Members...', 'buddypress' ),
                         'global_tables'   => array(
@@ -170 +181 @@
 
                 parent::setup_globals( $args );
 
+                // Set-up Extra permastructs for the register and activate pages
+                $this->register_permastruct = bp_get_signup_slug() . '/%' . $this->rewrite_ids['member_register'] . '%';
+                $this->activate_permastruct = bp_get_activate_slug() . '/%' . $this->rewrite_ids['member_activate'] . '%';
+
                 /** Logged in user ***************************************************
                  */
 
@@ -256 +271 @@
                         $bp->canonical_stack['base_url'] = bp_displayed_user_domain();
 
                         if ( bp_current_component() ) {
-                                $bp->canonical_stack['component'] = bp_current_component();
+                                $item_component = bp_current_component();
+                                $bp->canonical_stack['component'] = $item_component;
+
+                                if ( bp_use_wp_rewrites() ) {
+                                        $bp->canonical_stack['component'] = bp_rewrites_get_slug( 'members', 'bp_member_' . $item_component, $item_component );
+                                }
                         }
 
                         if ( bp_current_action() ) {
@@ -337 +357 @@
                                 'position'            => 20,
                                 'screen_function'     => 'bp_members_screen_display_profile',
                                 'default_subnav_slug' => 'public',
-                                'item_css_id'         => buddypress()->profile->id
+                                'item_css_id'         => buddypress()->profile->id,
+                                'rewrite_id'          => 'bp_member_profile',
                         );
                 }
 
@@ -367 +388 @@
                                 'position'            => 5,
                                 'screen_function'     => 'bp_members_screen_display_profile',
                                 'default_subnav_slug' => 'public',
+                                'rewrite_id'          => 'bp_member_front',
                         );
 
                         // We need a dummy subnav for the front page to load.
@@ -456 +478 @@
 
                 parent::setup_cache_groups();
         }
+
+        /**
+         * Add the component's rewrite tags.
+         *
+         * @since 6.0.0
+         *
+         * @param array $rewrite_tags Optional. See BP_Component::add_rewrite_tags() for
+         *                            description.
+         */
+        public function add_rewrite_tags( $rewrite_tags = array() ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::add_rewrite_tags( $rewrite_tags );
+                }
+
+                $rewrite_tags = array(
+                        'directory' => array(
+                                'id'    => '%' . $this->rewrite_ids['directory'] . '%',
+                                'regex' => '([1]{1,})',
+                        ),
+                        'directory-type' => array(
+                                'id'    => '%' . $this->rewrite_ids['directory_type'] . '%',
+                                'regex' => '([^/]+)',
+                        ),
+                        'member-register' => array(
+                                'id'    => '%' . $this->rewrite_ids['member_register'] . '%',
+                                'regex' => '([1]{1,})',
+                        ),
+                        'member-activate' => array(
+                                'id'    => '%' . $this->rewrite_ids['member_activate'] . '%',
+                                'regex' => '([1]{1,})',
+                        ),
+                        'member-activate-key' => array(
+                                'id'    => '%' . $this->rewrite_ids['member_activate_key'] . '%',
+                                'regex' => '([^/]+)',
+                        ),
+                        'single-item' => array(
+                                'id'      => '%' . $this->rewrite_ids['single_item'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                        'single-item-component' => array(
+                                'id'      => '%' . $this->rewrite_ids['single_item_component'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                        'single-item-action' => array(
+                                'id'      => '%' . $this->rewrite_ids['single_item_action'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                        'single-item-action-variables' => array(
+                                'id'      => '%' . $this->rewrite_ids['single_item_action_variables'] . '%',
+                                'regex'   => '([^/]+)',
+                        ),
+                );
+
+                parent::add_rewrite_tags( $rewrite_tags );
+        }
+
+        /**
+         * Add the component's rewrite rules.
+         *
+         * @since 6.0.0
+         *
+         * @param array $rewrite_rules Optional. See BP_Component::add_rewrite_rules() for
+         *                             description.
+         */
+        public function add_rewrite_rules( $rewrite_rules = array() ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::add_rewrite_rules( $rewrite_rules );
+                }
+
+                $rewrite_rules = array(
+                        'member-register' => array(
+                                'regex' => bp_get_signup_slug(),
+                                'query' => 'index.php?' . $this->rewrite_ids['member_register'] . '=1',
+                        ),
+                        'member-activate-key' => array(
+                                'regex' => bp_get_activate_slug() . '/([^/]+)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['member_activate'] . '=1&' . $this->rewrite_ids['member_activate_key'] . '=$matches[1]',
+                        ),
+                        'member-activate' => array(
+                                'regex' => bp_get_activate_slug(),
+                                'query' => 'index.php?' . $this->rewrite_ids['member_activate'] . '=1',
+                        ),
+                        'paged-directory-type' => array(
+                                'regex' => $this->root_slug . '/' . bp_get_members_member_type_base() . '/([^/]+)/page/?([0-9]{1,})/?$' ,
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['directory_type'] . '=$matches[1]&paged=$matches[2]',
+                        ),
+                        'directory-type' => array(
+                                'regex' => $this->root_slug . '/' . bp_get_members_member_type_base() . '/([^/]+)/?$' ,
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['directory_type'] . '=$matches[1]',
+                        ),
+                        'paged-directory' => array(
+                                'regex' => $this->root_slug . '/page/?([0-9]{1,})/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&paged=$matches[1]',
+                        ),
+                        'single-item-action-variables' => array(
+                                'regex' => $this->root_slug . '/([^/]+)\/([^/]+)\/([^/]+)\/(.+?)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['single_item'] . '=$matches[1]&' . $this->rewrite_ids['single_item_component'] . '=$matches[2]&' . $this->rewrite_ids['single_item_action'] . '=$matches[3]&' . $this->rewrite_ids['single_item_action_variables'] . '=$matches[4]',
+                        ),
+                        'single-item-action' => array(
+                                'regex' => $this->root_slug . '/([^/]+)\/([^/]+)\/([^/]+)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['single_item'] . '=$matches[1]&' . $this->rewrite_ids['single_item_component'] . '=$matches[2]&' . $this->rewrite_ids['single_item_action'] . '=$matches[3]',
+                        ),
+                        'single-item-component' => array(
+                                'regex' => $this->root_slug . '/([^/]+)\/([^/]+)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['single_item'] . '=$matches[1]&' . $this->rewrite_ids['single_item_component'] . '=$matches[2]',
+                        ),
+                        'single-item' => array(
+                                'regex' => $this->root_slug . '/([^/]+)/?$',
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['single_item'] . '=$matches[1]',
+                        ),
+                        'directory' => array(
+                                'regex' => $this->root_slug,
+                                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1',
+                        ),
+                );
+
+                parent::add_rewrite_rules( $rewrite_rules );
+        }
+
+        /**
+         * Add the component's directory permastructs.
+         *
+         * @since 6.0.0
+         *
+         * @param array $structs Optional. See BP_Component::add_permastructs() for
+         *                       description.
+         */
+        public function add_permastructs( $structs = array() ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::add_permastructs( $structs );
+                }
+
+                $permastructs = array(
+                        // Directory permastruct.
+                        $this->rewrite_ids['directory'] => array(
+                                'struct' => $this->directory_permastruct,
+                                'args'   => array(),
+                        ),
+                        // Register permastruct.
+                        $this->rewrite_ids['member_register'] => array(
+                                'struct' => $this->register_permastruct,
+                                'args'   => array(),
+                        ),
+                        // Activate permastruct.
+                        $this->rewrite_ids['member_activate'] => array(
+                                'struct' => $this->activate_permastruct,
+                                'args'   => array(),
+                        ),
+                );
+
+                parent::add_permastructs( $permastructs );
+        }
+
+        /**
+         * Parse the WP_Query and eventually display the component's directory or single item.
+         *
+         * @since 6.0.0
+         *
+         * @param WP_Query $query Required. See BP_Component::parse_query() for
+         *                        description.
+         */
+        public function parse_query( WP_Query $query ) {
+                if ( ! bp_use_wp_rewrites() ) {
+                        return parent::parse_query( $query );
+                }
+
+                // Init the current member and member type.
+                $member       = false;
+                $member_type  = false;
+                $member_data  = bp_rewrites_get_member_data();
+
+                if ( isset( $member_data['object'] ) && $member_data['object'] ) {
+                        bp_reset_query( trailingslashit( $this->root_slug ) . $GLOBALS['wp']->request, $query );
+                        $member = $member_data['object'];
+
+                        // Make sure the Member's screen is fired.
+                        add_action( 'bp_screens', 'bp_members_screen_display_profile', 3 );
+                }
+
+                $is_members_component   = 1 === (int) $query->get( $this->rewrite_ids['directory'] );
+                $is_register_component  = 1 === (int) $query->get( $this->rewrite_ids['member_register'] );
+                $is_activate_component  = 1 === (int) $query->get( $this->rewrite_ids['member_activate'] );
+                $bp                     = buddypress();
+
+                if ( $is_members_component ) {
+                        $bp->current_component = 'members';
+                        $member_slug           = $query->get( $this->rewrite_ids['single_item'] );
+                        $member_type_slug      = $query->get( $this->rewrite_ids['directory_type'] );
+
+
+                        if ( $member_slug ) {
+                                $bp->current_component = '';
+
+                                // Unless root profiles are on, the member shouldn't be set yet.
+                                if ( ! $member ) {
+                                        $member = get_user_by( $member_data['field'], $member_slug );
+
+                                        if ( ! $member ) {
+                                                bp_do_404();
+                                                return;
+                                        }
+                                }
+
+                                // If the member is marked as a spammer, 404 (unless logged-in user is a super admin).
+                                if ( bp_is_user_spammer( $member->ID ) ) {
+                                        if ( bp_current_user_can( 'bp_moderate' ) ) {
+                                                bp_core_add_message( __( 'This user has been marked as a spammer. Only site admins can view this profile.', 'buddypress' ), 'warning' );
+                                        } else {
+                                                bp_do_404();
+                                                return;
+                                        }
+                                }
+
+                                // Set the displayed user and the current item.
+                                $bp->displayed_user->id = $member->ID;
+                                $bp->current_item       = $member_slug;
+
+                                // The core userdata of the user who is currently being displayed.
+                                if ( ! isset( $bp->displayed_user->userdata ) || ! $bp->displayed_user->userdata ) {
+                                        $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
+                                }
+
+                                // Fetch the full name displayed user.
+                                if ( ! isset( $bp->displayed_user->fullname ) || ! $bp->displayed_user->fullname ) {
+                                        $bp->displayed_user->fullname = '';
+                                        if ( isset( $bp->displayed_user->userdata->display_name ) ) {
+                                                $bp->displayed_user->fullname = $bp->displayed_user->userdata->display_name;
+                                        }
+                                }
+
+                                // The domain for the user currently being displayed.
+                                if ( ! isset( $bp->displayed_user->domain ) || ! $bp->displayed_user->domain ) {
+                                        $bp->displayed_user->domain   = bp_core_get_user_domain( bp_displayed_user_id() );
+                                }
+
+                                // If A user is displayed, check if there is a front template
+                                if ( bp_get_displayed_user() ) {
+                                        $bp->displayed_user->front_template = bp_displayed_user_get_front_template();
+                                }
+
+                                $member_component = $query->get( $this->rewrite_ids['single_item_component'] );
+                                if ( $member_component ) {
+
+                                        // Check if the member's component slug has been customized.
+                                        $item_component_rewrite_id = bp_rewrites_get_custom_slug_rewrite_id( 'members', $member_component );
+                                        if ( $item_component_rewrite_id ) {
+                                                $member_component = str_replace( 'bp_member_', '', $item_component_rewrite_id );
+                                        }
+
+                                        $bp->current_component = $member_component;
+                                }
+
+                                $current_action = $query->get( $this->rewrite_ids['single_item_action'] );
+                                if ( $current_action ) {
+                                        $bp->current_action = $current_action;
+                                }
+
+                                $action_variables = $query->get( $this->rewrite_ids['single_item_action_variables'] );
+                                if ( $action_variables ) {
+                                        if ( ! is_array( $action_variables ) )  {
+                                                $bp->action_variables = explode( '/', ltrim( $action_variables, '/' ) );
+                                        } else {
+                                                $bp->action_variables = $action_variables;
+                                        }
+                                }
+
+                        // Is this a member type query ?
+                        } elseif ( $member_type_slug ) {
+                                $member_type = bp_get_member_types( array(
+                                        'has_directory'  => true,
+                                        'directory_slug' => $member_type_slug,
+                                ) );
+
+                                if ( $member_type ) {
+                                        $member_type             = reset( $member_type );
+                                        $bp->current_member_type = $member_type;
+                                } else {
+                                        $bp->current_component = '';
+                                        bp_do_404();
+                                        return;
+                                }
+                        }
+
+                        /**
+                         * Set the BuddyPress queried object.
+                         */
+                        $query->queried_object    = get_post( $bp->pages->members->id );
+                        $query->queried_object_id = $query->queried_object->ID;
+
+                        if ( $member ) {
+                                $query->queried_object->single_item_name = $member->display_name;
+                        } elseif ( $member_type ) {
+                                $query->queried_object->directory_type_name = $member_type;
+                        }
+
+                // Handle the custom registration page.
+                } elseif ( $is_register_component ) {
+                        $bp->current_component = 'register';
+
+                // Handle the custom activation page.
+                } elseif ( $is_activate_component ) {
+                        $bp->current_component = 'activate';
+
+                        $current_action = $query->get( $this->rewrite_ids['member_activate_key'] );
+                        if ( $current_action ) {
+                                $bp->current_action = $current_action;
+                        }
+                }
+
+                parent::parse_query( $query );
+        }
 }

src/bp-members/screens/activate.php

@@ -100 +100 @@
         // If there were errors, add a message and redirect.
         if ( ! empty( $user->errors ) ) {
                 bp_core_add_message( $user->get_error_message(), 'error' );
-                bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
+                bp_core_redirect( bp_get_activation_page() );
         }
 
         bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
         bp_core_redirect( add_query_arg( 'activated', '1', bp_get_activation_page() ) );
 
 }
-add_action( 'bp_actions', 'bp_members_action_activate_account' );
- No newline at end of file
+add_action( 'bp_actions', 'bp_members_action_activate_account' );

src/bp-messages/classes/class-bp-messages-component.php

@@ -231 +231 @@
                         'show_for_displayed_user' => $access,
                         'screen_function'         => 'messages_screen_inbox',
                         'default_subnav_slug'     => 'inbox',
-                        'item_css_id'             => $this->id
+                        'item_css_id'             => $this->id,
+                        'rewrite_id'              => 'bp_member_' . $slug,
                 );
 
                 // Add the subnav items to the profile.

src/bp-notifications/classes/class-bp-notifications-component.php

@@ -180 +180 @@
                         'screen_function'         => 'bp_notifications_screen_unread',
                         'default_subnav_slug'     => 'unread',
                         'item_css_id'             => $this->id,
+                        'rewrite_id'              => 'bp_member_' . $slug,
                 );
 
                 // Add the subnav items to the notifications nav item.

src/bp-settings/classes/class-bp-settings-component.php

@@ -144 +144 @@
                         'position'                => 100,
                         'show_for_displayed_user' => $access,
                         'screen_function'         => 'bp_settings_screen_general',
-                        'default_subnav_slug'     => 'general'
+                        'default_subnav_slug'     => 'general',
+                        'rewrite_id'              => 'bp_member_' . $slug,
                 );
 
                 // Add General Settings nav item.

src/bp-templates/bp-nouveau/includes/blogs/functions.php

@@ -47 +47 @@
                                 'component' => 'blogs',
                                 'slug'      => 'create', // slug is used because BP_Core_Nav requires it, but it's the scope
                                 'li_class'  => array( 'no-ajax', 'site-create', 'create-button' ),
-                                'link'      => trailingslashit( bp_get_blogs_directory_permalink() . 'create' ),
+                                'link'      => bp_get_blog_create_link(),
                                 'text'      => __( 'Create a Site', 'buddypress' ),
                                 'count'     => false,
                                 'position'  => 999,

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

@@ -532 +532 @@
                                 'component' => 'groups',
                                 'slug'      => 'create', // slug is used because BP_Core_Nav requires it, but it's the scope
                                 'li_class'  => array( 'no-ajax', 'group-create', 'create-button' ),
-                                'link'      => trailingslashit( bp_get_groups_directory_permalink() . 'create' ),
+                                'link'      => bp_get_group_create_link(),
                                 'text'      => __( 'Create a Group', 'buddypress' ),
                                 'count'     => false,
                                 'position'  => 999,

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

@@ -1039 +1039 @@
                         $link = $nav_item->link;
                 }
 
-                if ( 'personal' === $bp_nouveau->displayed_nav && ! empty( $nav_item->primary ) ) {
-                        if ( bp_loggedin_user_domain() ) {
-                                $link = str_replace( bp_loggedin_user_domain(), bp_displayed_user_domain(), $link );
-                        } else {
-                                $link = trailingslashit( bp_displayed_user_domain() . $link );
+                /**
+                 * Rewrites directly set the displayed user link. This substitution is
+                 * only required when BuddyPress is using the legacy URL parser.
+                 */
+                if ( ! bp_use_wp_rewrites() ) {
+                        if ( 'personal' === $bp_nouveau->displayed_nav && ! empty( $nav_item->primary ) ) {
+                                if ( bp_loggedin_user_domain() ) {
+                                        $link = str_replace( bp_loggedin_user_domain(), bp_displayed_user_domain(), $link );
+                                } else {
+                                        $link = trailingslashit( bp_displayed_user_domain() . $link );
+                                }
                         }
                 }
 

src/bp-xprofile/bp-xprofile-template.php

@@ -363 +363 @@
  * Output the XProfile group edit form action.
  *
  * @since 1.1.0
+ * @since 6.0.0 Added the `$fields_group_id` parameter.
+ *
+ * @param int $fields_group_id The ID of the group of fields.
  */
-function bp_the_profile_group_edit_form_action() {
-        echo bp_get_the_profile_group_edit_form_action();
+function bp_the_profile_group_edit_form_action( $fields_group_id = 0 ) {
+        echo bp_get_the_profile_group_edit_form_action( $fields_group_id );
 }
 
         /**
          * Return the XProfile group edit form action.
          *
          * @since 1.1.0
+         * @since 6.0.0 Added the `$fields_group_id` parameter.
          *
+         * @param int $fields_group_id The ID of the group of fields.    *
          * @return string
          */
-        function bp_get_the_profile_group_edit_form_action() {
-                global $group;
+        function bp_get_the_profile_group_edit_form_action( $fields_group_id = 0 ) {
+                if ( ! $fields_group_id ) {
+                        global $group;
+
+                        $fields_group_id =& $group->id;
+                }
+
 
                 // Build the form action URL.
-                $form_action = trailingslashit( bp_displayed_user_domain() . bp_get_profile_slug() . '/edit/group/' . $group->id );
+                $form_action = trailingslashit( bp_displayed_user_domain() . bp_get_profile_slug() . '/edit/group/' . $fields_group_id );
 
                 /**
                  * Filters the action for the XProfile group edit form.
                  *
                  * @since 1.1.0
+                 * @since 6.0.0 Added the `$fields_group_id` parameter.
                  *
-                 * @param string $value URL for the action attribute on the
-                 *                      profile group edit form.
+                 * @param string $form_action     URL for the action attribute on the
+                 *                                profile group edit form.
+                 * @param int    $fields_group_id The ID of the group of fields.
                  */
-                return apply_filters( 'bp_get_the_profile_group_edit_form_action', $form_action );
+                return apply_filters( 'bp_get_the_profile_group_edit_form_action', $form_action, $fields_group_id );
         }
 
 /**

src/bp-xprofile/classes/class-bp-xprofile-component.php

@@ -254 +254 @@
                         'position'            => 20,
                         'screen_function'     => 'xprofile_screen_display_profile',
                         'default_subnav_slug' => 'public',
-                        'item_css_id'         => $this->id
+                        'item_css_id'         => $this->id,
+                        'rewrite_id'          => 'bp_member_' . $slug,
                 );
 
                 // Add the subnav items to the profile.

src/bp-xprofile/screens/edit.php

@@ -22 +22 @@
 
         // Make sure a group is set.
         if ( ! bp_action_variable( 1 ) ) {
-                bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_profile_slug() . '/edit/group/1' ) );
+                bp_core_redirect( bp_get_the_profile_group_edit_form_action( 1 ) );
         }
 
         // Check the field group exists.
@@ -42 +42 @@
 
                 // Check we have field ID's.
                 if ( empty( $_POST['field_ids'] ) ) {
-                        bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_profile_slug() . '/edit/group/' . bp_action_variable( 1 ) ) );
+                        bp_core_redirect( bp_get_the_profile_group_edit_form_action( bp_action_variable( 1 ) ) );
                 }
 
                 // Explode the posted field IDs into an array so we know which
@@ -134 +134 @@
                         }
 
                         // Redirect back to the edit screen to display the updates and message.
-                        bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_profile_slug() . '/edit/group/' . bp_action_variable( 1 ) ) );
+                        bp_core_redirect( bp_get_the_profile_group_edit_form_action( bp_action_variable( 1 ) ) );
                 }
         }
 
@@ -153 +153 @@
          * @param string $template Path to the XProfile edit template to load.
          */
         bp_core_load_template( apply_filters( 'xprofile_template_edit_profile', 'members/single/home' ) );
-}
- No newline at end of file
+}

src/class-buddypress.php

@@ -474 +474 @@
                 require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'            );
                 require( $this->plugin_dir . 'bp-core/bp-core-update.php'           );
                 require( $this->plugin_dir . 'bp-core/bp-core-options.php'          );
+                require( $this->plugin_dir . 'bp-core/bp-core-rewrites.php'         );
                 require( $this->plugin_dir . 'bp-core/bp-core-taxonomy.php'         );
                 require( $this->plugin_dir . 'bp-core/bp-core-filters.php'          );
                 require( $this->plugin_dir . 'bp-core/bp-core-attachments.php'      );