Changeset 13436

Timestamp:

03/15/2023 08:16:46 AM (18 months ago)

Author:

imath

Message:

Make more BuddyPress generated links ready for BP Rewrites

• Improve the Members component adding permastructs and custom rewrite

rules for registration and activation pages.

• Improve the Blogs component adding custom rewrite rule to handle the

Blogs create page.

• Make a huge progress about replacing all occurrences of

bp_get_root_domain() (45 replacements were performed).

• Deprecate bp_groups_directory_permalink(),

bp_get_groups_directory_permalink(), bp_blogs_directory_permalink() &
bp_get_blogs_directory_permalink() and replace them with these new
functions: bp_groups_directory_url(), bp_get_groups_directory_url(),
bp_blogs_directory_url() & bp_get_blogs_directory_url().

• Although bp_loggedin_user_domain() & bp_displayed_user_domain()

should also be deprecated, we're leaving them as aliases of the right
functions to use. Plugin authors shouldn't use them to build other links
than member's profile home url.

NB: these deprecations are required because these functions were used
to build BuddyPress URLs concatenating URL chunks. Once the BP Classic
plugin will be built we will adapt the code to remove these deprecation
notices.

Props r-a-y, johnjamesjacoby, boonebgorges

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

Location:

trunk

Files:

• src/bp-activity/bp-activity-functions.php (modified) (1 diff)
• src/bp-activity/bp-activity-template.php (modified) (6 diffs)
• src/bp-activity/classes/class-bp-activity-oembed-extension.php (modified) (2 diffs)
• src/bp-activity/classes/class-bp-akismet.php (modified) (4 diffs)
• src/bp-activity/screens/permalink.php (modified) (2 diffs)
• src/bp-blogs/bp-blogs-blocks.php (modified) (1 diff)
• src/bp-blogs/bp-blogs-filters.php (modified) (2 diffs)
• src/bp-blogs/bp-blogs-template.php (modified) (6 diffs)
• src/bp-blogs/classes/class-bp-blogs-component.php (modified) (3 diffs)
• src/bp-blogs/classes/class-bp-blogs-recent-posts-widget.php (modified) (1 diff)
• src/bp-core/bp-core-avatars.php (modified) (2 diffs)
• src/bp-core/bp-core-blocks.php (modified) (1 diff)
• src/bp-core/bp-core-buddybar.php (modified) (1 diff)
• src/bp-core/bp-core-catchuri.php (modified) (3 diffs)
• src/bp-core/bp-core-filters.php (modified) (3 diffs)
• src/bp-core/bp-core-functions.php (modified) (5 diffs)
• src/bp-core/bp-core-rewrites.php (modified) (1 diff)
• src/bp-core/bp-core-template.php (modified) (3 diffs)
• src/bp-core/deprecated/12.0.php (modified) (1 diff)
• src/bp-groups/bp-groups-notifications.php (modified) (3 diffs)
• src/bp-groups/bp-groups-template.php (modified) (3 diffs)
• src/bp-members/bp-members-filters.php (modified) (2 diffs)
• src/bp-members/bp-members-functions.php (modified) (4 diffs)
• src/bp-members/bp-members-template.php (modified) (14 diffs)
• src/bp-members/classes/class-bp-members-component.php (modified) (2 diffs)
• src/bp-members/screens/activate.php (modified) (1 diff)
• src/bp-members/screens/register.php (modified) (2 diffs)
• src/bp-messages/bp-messages-template.php (modified) (6 diffs)
• src/bp-notifications/bp-notifications-template.php (modified) (3 diffs)
• src/bp-settings/actions/delete-account.php (modified) (1 diff)
• src/bp-templates/bp-legacy/buddypress/members/activate.php (modified) (1 diff)
• src/bp-templates/bp-nouveau/buddypress/members/activate.php (modified) (1 diff)
• src/bp-templates/bp-nouveau/includes/activity/template-tags.php (modified) (2 diffs)
• src/bp-templates/bp-nouveau/includes/blogs/functions.php (modified) (2 diffs)
• tests/phpunit/includes/testcase.php (modified) (1 diff)
• tests/phpunit/testcases/activity/class.BP_Activity_Activity.php (modified) (1 diff)
• tests/phpunit/testcases/activity/notifications.php (modified) (1 diff)
• tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageId.php (modified) (2 diffs)
• tests/phpunit/testcases/core/nav/backCompat.php (modified) (4 diffs)
• tests/phpunit/testcases/core/nav/bpCoreMaybeHookNewSubnavScreenFunction.php (modified) (1 diff)
• tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php (modified) (1 diff)
• tests/phpunit/testcases/groups/class-bp-group-extension.php (modified) (20 diffs)
• tests/phpunit/testcases/groups/class-bp-groups-member.php (modified) (2 diffs)
• tests/phpunit/testcases/members/template/bpGetMemberTypeDirectoryPermalink.php (modified) (4 diffs)

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

@@ -3263 +3263 @@
         $link = $activity_obj->primary_link;
     } else {
-        if ( 'activity_comment' == $activity_obj->type ) {
-            $link = bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $activity_obj->item_id . '/#acomment-' . $activity_obj->id;
+        $path_chunks = array(
+            'component_id'                 => 'activity',
+            'single_item_action'           => 'p',
+            'single_item_action_variables' => array( $activity_obj->id ),
+        );
+
+        if ( 'activity_comment' === $activity_obj->type ) {
+            $path_chunks['single_item_action_variables'] = array( $activity_obj->item_id );
+
+            $link = bp_rewrites_get_url( $path_chunks ) . '#acomment-' . $activity_obj->id;
         } else {
-            $link = bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $activity_obj->id . '/';
+            $link = bp_rewrites_get_url( $path_chunks );
         }
     }

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

@@ -87 +87 @@
      */
     function bp_get_activity_directory_permalink() {
+        $url = bp_rewrites_get_url(
+            array(
+                'component_id' => 'activity',
+            )
+        );
 
         /**
@@ -95 +100 @@
          * @param string $url Permalink url for the activity directory.
          */
-        return apply_filters( 'bp_get_activity_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_activity_root_slug() ) );
+        return apply_filters( 'bp_get_activity_directory_permalink', $url );
     }
 
@@ -2393 +2398 @@
      */
     function bp_get_activity_comment_delete_link() {
-        $link = wp_nonce_url( trailingslashit( bp_get_activity_directory_permalink() . 'delete/' . bp_get_activity_comment_id() ) . '?cid=' . bp_get_activity_comment_id(), 'bp_activity_delete_link' );
+        $url  = bp_rewrites_get_url(
+            array(
+                'component_id'                 => 'activity',
+                'single_item_action'           => 'delete',
+                'single_item_action_variables' => array( bp_get_activity_comment_id() ),
+            )
+        );
+        $link = wp_nonce_url( add_query_arg( 'cid', bp_get_activity_comment_id(), $url ), 'bp_activity_delete_link' );
 
         /**
@@ -2992 +3004 @@
         }
 
-        $url = trailingslashit( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/delete/' . $activity_id );
+        $url = bp_rewrites_get_url(
+            array(
+                'component_id'                 => 'activity',
+                'single_item_action'           => 'delete',
+                'single_item_action_variables' => array( $activity_id ),
+            )
+        );
 
         // Determine if we're on a single activity page, and customize accordingly.
@@ -3870 +3888 @@
      */
     function bp_get_sitewide_activity_feed_link() {
+        $url  = bp_rewrites_get_url(
+            array(
+                'component_id'       => 'activity',
+                'single_item_action' => 'feed',
+            )
+        );
 
         /**
@@ -3876 +3900 @@
          * @since 1.0.0
          *
-         * @param string $value The feed link for sitewide activity.
-         */
-        return apply_filters( 'bp_get_sitewide_activity_feed_link', bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/feed/' );
+         * @param string $url The feed link for sitewide activity.
+         */
+        return apply_filters( 'bp_get_sitewide_activity_feed_link', $url );
     }
 

trunk/src/bp-activity/classes/class-bp-activity-oembed-extension.php

@@ -86 +86 @@
     protected function validate_url_to_item_id( $url ) {
         if ( bp_core_enable_root_profiles() ) {
-            $domain = bp_get_root_domain();
+            $domain = bp_get_root_url();
         } else {
             $domain = bp_get_members_directory_permalink();
@@ -96 +96 @@
         }
 
-        // Check for activity slug.
-        if ( false === strpos( $url, '/' . bp_get_activity_slug() . '/' ) ) {
-            return false;
-        }
-
-        // Do more checks.
-        $url = trim( untrailingslashit( $url ) );
-
-        // Grab the activity ID.
-        $activity_id = (int) substr(
-            $url,
-            strrpos( $url, '/' ) + 1
-        );
+        if ( ! bp_has_pretty_urls() ) {
+            $url_query = wp_parse_url( $url, PHP_URL_QUERY );
+
+            if ( $url_query ) {
+                $query_vars = bp_parse_args( $url_query, array() );
+
+                if ( isset( $query_vars['bp_member_action'] ) ) {
+                    $activity_id = (int) $query_vars['bp_member_action'];
+                }
+            }
+
+        } elseif ( false !== strpos( $url, '/' . bp_get_activity_slug() . '/' ) ) {
+            // Do more checks.
+            $url = trim( untrailingslashit( $url ) );
+
+            // Grab the activity ID.
+            $activity_id = (int) substr(
+                $url,
+                strrpos( $url, '/' ) + 1
+            );
+        }
 
         if ( ! empty( $activity_id ) ) {

trunk/src/bp-activity/classes/class-bp-akismet.php

@@ -192 +192 @@
      */
     public function add_activity_spam_button() {
-        if ( !bp_activity_user_can_mark_spam() )
-            return;
+        if ( ! bp_activity_user_can_mark_spam() ) {
+            return;
+        }
 
         // By default, only handle activity updates and activity comments.
-        if ( !in_array( bp_get_activity_type(), BP_Akismet::get_activity_types() ) )
-            return;
+        if ( ! in_array( bp_get_activity_type(), BP_Akismet::get_activity_types(), true ) ) {
+            return;
+        }
+
+        $spam_link = bp_rewrites_get_url(
+            array(
+                'component_id'                 => 'activity',
+                'single_item_action'           => 'spam',
+                'single_item_action_variables' => array( bp_get_activity_id() ),
+            )
+        );
 
         bp_button(
@@ -205 +215 @@
                 'id'         => 'activity_make_spam_' . bp_get_activity_id(),
                 'link_class' => 'bp-secondary-action spam-activity confirm button item-button',
-                'link_href'  => wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_slug() . '/spam/' . bp_get_activity_id() . '/', 'bp_activity_akismet_spam_' . bp_get_activity_id() ),
+                'link_href'  => wp_nonce_url( $spam_link, 'bp_activity_akismet_spam_' . bp_get_activity_id() ),
                 'link_text'  => __( 'Spam', 'buddypress' ),
                 'wrapper'    => false,
@@ -220 +230 @@
      */
     public function add_activity_comment_spam_button() {
-        if ( !bp_activity_user_can_mark_spam() )
-            return;
+        if ( ! bp_activity_user_can_mark_spam() ) {
+            return;
+        }
 
         // By default, only handle activity updates and activity comments.
         $current_comment = bp_activity_current_comment();
-        if ( empty( $current_comment ) || !in_array( $current_comment->type, BP_Akismet::get_activity_types() ) )
-            return;
+        if ( empty( $current_comment ) || ! in_array( $current_comment->type, BP_Akismet::get_activity_types(), true ) ) {
+            return;
+        }
+
+        $spam_link = add_query_arg(
+            'cid',
+            bp_get_activity_comment_id(),
+            bp_rewrites_get_url(
+                array(
+                    'component_id'                 => 'activity',
+                    'single_item_action'           => 'spam',
+                    'single_item_action_variables' => array( bp_get_activity_comment_id() ),
+                )
+            )
+        );
 
         bp_button(
@@ -234 +258 @@
                 'id'         => 'activity_make_spam_' . bp_get_activity_comment_id(),
                 'link_class' => 'bp-secondary-action spam-activity-comment confirm',
-                'link_href'  => wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_slug() . '/spam/' . bp_get_activity_comment_id() . '/?cid=' . bp_get_activity_comment_id(), 'bp_activity_akismet_spam_' . bp_get_activity_comment_id() ),
+                'link_href'  => wp_nonce_url( $spam_link, 'bp_activity_akismet_spam_' . bp_get_activity_comment_id() ),
                 'link_text'  => __( 'Spam', 'buddypress' ),
                 'wrapper'    => false,

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

@@ -17 +17 @@
 function bp_activity_action_permalink_router() {
     // Not viewing activity.
-    if ( ! bp_is_activity_component() || ! bp_is_current_action( 'p' ) )
+    if ( ! bp_is_activity_component() || ! bp_is_current_action( 'p' ) ) {
         return false;
+    }
 
     // No activity to display.
-    if ( ! bp_action_variable( 0 ) || ! is_numeric( bp_action_variable( 0 ) ) )
+    if ( ! bp_action_variable( 0 ) || ! is_numeric( bp_action_variable( 0 ) ) ) {
         return false;
+    }
 
     // Get the activity details.
@@ -78 +80 @@
      */
     if ( ! $redirect = apply_filters_ref_array( 'bp_activity_permalink_redirect_url', array( $redirect, &$activity ) ) ) {
-        bp_core_redirect( bp_get_root_domain() );
+        bp_core_redirect( bp_get_root_url() );
     }
 

trunk/src/bp-blogs/bp-blogs-blocks.php

@@ -33 +33 @@
     $classnames           = 'widget_bp_blogs_widget buddypress widget';
     $wrapper_attributes   = get_block_wrapper_attributes( array( 'class' => $classnames ) );
-    $blogs_directory_link = bp_get_blogs_directory_permalink();
+    $blogs_directory_link = bp_get_blogs_directory_url();
     $max_posts            = (int) $block_args['maxPosts'];
     $no_posts             = __( 'Sorry, there were no posts found.', 'buddypress' );

trunk/src/bp-blogs/bp-blogs-filters.php

@@ -30 +30 @@
  */
 function bp_blogs_creation_location( $url ) {
+    $bp_url = bp_get_blogs_directory_url(
+        array(
+            'create_single_item' => 1,
+        )
+    );
 
     /**
@@ -36 +41 @@
      * @since 1.6.0
      *
-     * @param string $permalink URL for the 'Create a new site' signup page.
-     * @param string $url       The original URL (points to wp-signup.php by default).
+     * @param string $bp_url URL for the 'Create a new site' signup page.
+     * @param string $url    The original URL (points to wp-signup.php by default).
      */
-    return apply_filters( 'bp_blogs_creation_location', trailingslashit( bp_get_blogs_directory_permalink() . 'create' ), $url );
+    return apply_filters( 'bp_blogs_creation_location', $bp_url, $url );
 }
 add_filter( 'wp_signup_location', 'bp_blogs_creation_location' );

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

@@ -68 +68 @@
 
 /**
- * Output blog directory permalink.
- *
- * @since 1.5.0
- *
- */
-function bp_blogs_directory_permalink() {
-    echo esc_url( bp_get_blogs_directory_permalink() );
-}
-    /**
-     * Return blog directory permalink.
-     *
-     * @since 1.5.0
-     *
-     *
-     * @return string The URL of the Blogs directory.
-     */
-    function bp_get_blogs_directory_permalink() {
-
-        /**
-         * Filters the blog directory permalink.
-         *
-         * @since 1.5.0
-         *
-         * @param string $value Permalink URL for the blog directory.
-         */
-        return apply_filters( 'bp_get_blogs_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) );
-    }
+ * Output Blogs directory's URL.
+ *
+ * @since 12.0.0
+ */
+function bp_blogs_directory_url() {
+    echo esc_url( bp_get_blogs_directory_url() );
+}
+
+/**
+ * Returns the Blogs directory's URL.
+ *
+ * @since 12.0.0
+ *
+ * @param array $path_chunks {
+ *     An array of arguments. Optional.
+ *
+ *     @type int $create_single_item `1` to get the Blogs create link.
+ * }
+ * @return string The URL built for the BP Rewrites URL parser.
+ */
+function bp_get_blogs_directory_url( $path_chunks = array() ) {
+    $supported_chunks = array_fill_keys( array( 'create_single_item' ), true );
+
+    $path_chunks = bp_parse_args(
+        array_intersect_key( $path_chunks, $supported_chunks ),
+        array(
+            'component_id' => 'blogs'
+        )
+    );
+
+    $url = bp_rewrites_get_url( $path_chunks );
+
+    /**
+     * Filters the Blogs directory's URL.
+     *
+     * @since 12.0.0
+     *
+     * @param string  $url      The Blogs directory's URL.
+     * @param array   $path_chunks {
+     *     An array of arguments. Optional.
+     *
+     *     @type int $create_single_item `1` to get the Blogs create link.
+     * }
+     */
+    return apply_filters( 'bp_get_blogs_directory_url', $url, $path_chunks );
+}
 
 /**
@@ -474 +493 @@
         global $blogs_template;
 
-        if ( empty( $blogs_template->blog->domain ) )
-            $permalink = bp_get_root_domain() . $blogs_template->blog->path;
-        else {
+        if ( ! empty( $blogs_template->blog->domain ) ) {
+            $permalink = get_site_url( $blogs_template->blog->blog_id );
+
+        } else {
             $protocol = 'http://';
-            if ( is_ssl() )
+            if ( is_ssl() ) {
                 $protocol = 'https://';
+            }
 
             $permalink = $protocol . $blogs_template->blog->domain . $blogs_template->blog->path;
@@ -1349 +1370 @@
     }
 
+    $url = bp_get_blogs_directory_url(
+        array(
+            'create_single_item' => 1,
+        )
+    );
+
     /**
      * Filters "Create a Site" links for users viewing their own profiles.
@@ -1354 +1381 @@
      * @since 1.0.0
      *
-     * @param string $value HTML link for creating a site.
-     */
-    echo apply_filters( 'bp_create_blog_link', '<a href="' . trailingslashit( bp_get_blogs_directory_permalink() . 'create' ) . '">' . __( 'Create a Site', 'buddypress' ) . '</a>' );
+     * @param string $url HTML link for creating a site.
+     */
+    echo apply_filters( 'bp_create_blog_link', '<a href="' . $url . '">' . __( 'Create a Site', 'buddypress' ) . '</a>' );
 }
 
@@ -1460 +1487 @@
         }
 
+        $url = bp_get_blogs_directory_url(
+            array(
+                'create_single_item' => 1,
+            )
+        );
+
         $button_args = array(
             'id'         => 'create_blog',
@@ -1465 +1498 @@
             'link_text'  => __( 'Create a Site', 'buddypress' ),
             'link_class' => 'blog-create no-ajax',
-            'link_href'  => trailingslashit( bp_get_blogs_directory_permalink() . 'create' ),
+            'link_href'  => $url,
             'wrapper'    => false,
             'block_self' => false,

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

@@ -82 +82 @@
             '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'                    => 'blogs',
-                'single_item_action'           => 'blogs_action',
-                'single_item_action_variables' => 'blogs_action_variables',
+                'directory'          => 'blogs',
+                'create_single_item' => 'blog_create',
             ),
             'directory_title'       => isset( $bp->pages->blogs->title ) ? $bp->pages->blogs->title : $default_directory_title,
@@ -312 +311 @@
             // Create a Site.
             if ( bp_blog_signup_enabled() ) {
+                $url = bp_get_blogs_directory_url(
+                    array(
+                        'create_single_item' => 1,
+                    )
+                );
+
                 $wp_admin_nav[] = array(
                     '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'     => $url,
                     'position' => 99
                 );
@@ -371 +376 @@
 
         parent::setup_cache_groups();
+    }
+
+    /**
+     * Add the Blog Create rewrite tags.
+     *
+     * @since 12.0.0
+     *
+     * @param array $rewrite_tags Optional. See BP_Component::add_rewrite_tags() for
+     *                            description.
+     */
+    public function add_rewrite_tags( $rewrite_tags = array() ) {
+        $rewrite_tags = array(
+            'create_single_item' => '([1]{1,})',
+        );
+
+        parent::add_rewrite_tags( $rewrite_tags );
+    }
+
+    /**
+     * Add the Registration and Activation rewrite rules.
+     *
+     * @since 12.0.0
+     *
+     * @param array $rewrite_rules Optional. See BP_Component::add_rewrite_rules() for
+     *                             description.
+     */
+    public function add_rewrite_rules( $rewrite_rules = array() ) {
+        $create_slug = bp_rewrites_get_slug( 'blogs', 'blog_create', 'create' );
+
+        $rewrite_rules = array(
+            'create_single_item' => array(
+                'regex' => $this->root_slug . '/' . $create_slug . '/?$',
+                'order' => 50,
+                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['create_single_item'] . '=1',
+            ),
+        );
+
+        parent::add_rewrite_rules( $rewrite_rules );
     }
 

trunk/src/bp-blogs/classes/class-bp-blogs-recent-posts-widget.php

@@ -50 +50 @@
 
         if ( ! empty( $instance['link_title'] ) ) {
-            $title = '<a href="' . bp_get_blogs_directory_permalink() . '">' . esc_html( $title ) . '</a>';
+            $title = '<a href="' . bp_get_blogs_directory_url() . '">' . esc_html( $title ) . '</a>';
         }
 

trunk/src/bp-core/bp-core-avatars.php

@@ -201 +201 @@
  *                                   provided, the function will infer it: for users, by getting the
  *                                   user's email from the database, for groups/blogs, by concatenating
- *                                   "{$item_id}-{$object}@{bp_get_root_domain()}". The user query adds
+ *                                   "{$item_id}-{$object}@{bp_get_domain()}". The user query adds
  *                                   overhead, so it's recommended that wrapper functions provide a
  *                                   value for 'email' when querying user IDs. Default: false.
@@ -642 +642 @@
                 $params['email'] = bp_core_get_user_email( $params['item_id'] );
             } elseif ( 'group' == $params['object'] || 'blog' == $params['object'] ) {
-                $params['email'] = $params['item_id'] . '-' . $params['object'] . '@' . bp_get_root_domain();
+                $params['email'] = $params['item_id'] . '-' . $params['object'] . '@' . bp_get_domain();
             }
         }

trunk/src/bp-core/bp-core-blocks.php

@@ -235 +235 @@
             $content .= sprintf(
                 '<p class="bp-login-widget-pwd-link"><a href="%1$s">%2$s</a></p>',
-                esc_url( wp_lostpassword_url( bp_get_root_domain() ) ),
+                esc_url( wp_lostpassword_url( bp_get_root_url() ) ),
                 esc_html__( 'Lost your password?', 'buddypress' )
             );

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

@@ -780 +780 @@
             } else {
                 $message     = __( 'You do not have access to this page.', 'buddypress' );
-                $redirect_to = bp_get_root_domain();
+                $redirect_to = bp_get_root_url();
             }
 

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

@@ -632 +632 @@
  *                            logging in. Default: the URL originally requested.
  *     @type string $root     The root URL of the site, used in case of error or mode 1 redirects.
- *                            Default: the value of {@link bp_get_root_domain()}.
+ *                            Default: the value of {@link bp_get_root_url()}.
  *     @type string $message  An error message to display to the user on the log-in page.
  *                            Default: "You must log in to access the page you requested."
@@ -647 +647 @@
         'mode'     => 2,                    // 1 = $root, 2 = wp-login.php.
         'redirect' => $redirect_url,        // the URL you get redirected to when a user successfully logs in.
-        'root'     => bp_get_root_domain(), // the landing page you get redirected to when a user doesn't have access.
+        'root'     => bp_get_root_url(),    // the landing page you get redirected to when a user doesn't have access.
         'message'  => __( 'You must log in to access the page you requested.', 'buddypress' )
     );
@@ -908 +908 @@
          */
         if ( false !== $front_page_component && bp_is_current_component( $front_page_component ) && ! bp_current_action() && ! bp_get_current_member_type() ) {
-            $bp->canonical_stack['canonical_url'] = trailingslashit( bp_get_root_domain() );
+            $bp->canonical_stack['canonical_url'] = bp_get_root_url();
 
         // Except when the front page is set to the registration page

trunk/src/bp-core/bp-core-filters.php

@@ -384 +384 @@
      * @param string $value URL to redirect to.
      */
-    return apply_filters( 'bp_core_login_redirect_to', bp_get_root_domain() );
+    return apply_filters( 'bp_core_login_redirect_to', bp_get_root_url() );
 }
 add_filter( 'bp_login_redirect', 'bp_core_login_redirect', 10, 3 );
@@ -1206 +1206 @@
 function bp_email_set_default_tokens( $tokens, $property_name, $transform, $email ) {
     $tokens['site.admin-email'] = bp_get_option( 'admin_email' );
-    $tokens['site.url']         = bp_get_root_domain();
+    $tokens['site.url']         = bp_get_root_url();
     $tokens['email.subject']    = $email->get_subject();
 
@@ -1236 +1236 @@
 
             if ( bp_is_active( 'settings' ) && empty( $tokens['unsubscribe'] ) ) {
-                $tokens['unsubscribe'] = esc_url( sprintf(
-                    '%s%s/notifications/',
-                    bp_members_get_user_url( $user_obj->ID ),
-                    bp_get_settings_slug()
-                ) );
+                $tokens['unsubscribe'] = esc_url(
+                    bp_members_get_user_url(
+                        $user_obj->ID,
+                        array(
+                            'single_item_component' => bp_rewrites_get_slug( 'members', 'member_settings', bp_get_settings_slug() ),
+                            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_settings_notifications', 'notifications' ),
+                        )
+                    )
+                );
             }
         }

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

@@ -1116 +1116 @@
 function bp_core_get_root_domain() {
     _deprecated_function( __FUNCTION__, '12.0.0', 'bp_rewrites_get_root_url()' );
-
     $domain = bp_rewrites_get_root_url();
 
@@ -1145 +1144 @@
     // have a valid URL.
     if ( empty( $location ) ) {
-        $location = bp_get_root_domain();
+        $location = bp_get_root_url();
     }
 
@@ -2530 +2529 @@
 
     if ( empty( $_POST['search-terms'] ) ) {
-        bp_core_redirect( bp_get_root_domain() );
+        bp_core_redirect( bp_get_root_url() );
         return;
     }
@@ -2574 +2573 @@
 
         if ( empty( $slug ) && 'posts' != $search_which ) {
-            bp_core_redirect( bp_get_root_domain() );
+            bp_core_redirect( bp_get_root_url() );
             return;
         }
@@ -4368 +4367 @@
     } else {
         if ( bp_is_active( 'settings' ) ) {
-            $redirect_to = sprintf(
-                '%s%s/notifications/',
-                bp_members_get_user_url( $raw_user_id ),
-                bp_get_settings_slug()
+            $redirect_to = bp_members_get_user_url(
+                $raw_user_id,
+                array(
+                    'single_item_component' => bp_rewrites_get_slug( 'members', 'member_settings', bp_get_settings_slug() ),
+                    'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_settings_notifications', 'notifications' ),
+                )
             );
         } else {

trunk/src/bp-core/bp-core-rewrites.php

@@ -172 +172 @@
                 $create_slug = 'create';
                 if ( 'groups' === $component->id ) {
-                    $create_slug = bp_rewrites_get_slug( 'groups', 'bp_group_create', 'create' );
+                    $create_slug = bp_rewrites_get_slug( 'groups', 'group_create', 'create' );
+                } elseif ( 'blogs' === $component->id ) {
+                    $create_slug = bp_rewrites_get_slug( 'blogs', 'blog_create', 'create' );
                 }
 

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

@@ -518 +518 @@
  */
 function bp_search_form_action() {
+    $url = bp_rewrites_get_url(
+        array(
+            'component_id' => bp_get_search_slug(),
+        )
+    );
 
     /**
@@ -524 +529 @@
      * @since 1.0.0
      *
-     * @param string $value Search form action url.
-     */
-    return apply_filters( 'bp_search_form_action', trailingslashit( bp_get_root_domain() . '/' . bp_get_search_slug() ) );
+     * @param string $url Search form action url.
+     */
+    return apply_filters( 'bp_search_form_action', $url );
 }
 
@@ -1397 +1402 @@
      */
     return apply_filters( 'bp_action_variable', $action_variable, $position );
+}
+
+/**
+ * Returns the BP root blog's domain name.
+ *
+ * @since 12.0.0
+ *
+ * @return string The BP root blog's domain name.
+ */
+function bp_get_domain() {
+    return wp_parse_url( bp_get_root_url(), PHP_URL_HOST );
 }
 

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

@@ -242 +242 @@
     return apply_filters_deprecated( 'bp_core_get_user_domain', array( $domain, $user_id, $user_nicename, $user_login), '12.0.0', 'bp_members_get_user_url' );
 }
+
+/**
+ * Get the link for the logged-in user's profile.
+ *
+ * @since 1.0.0
+ * @deprecated 12.0.0
+ *
+ * @return string
+ */
+function bp_get_loggedin_user_link() {
+    _deprecated_function( __FUNCTION__, '12.0.0', 'bp_loggedin_user_url()' );
+    $url = bp_loggedin_user_url();
+
+    /**
+     * Filters the link for the logged-in user's profile.
+     *
+     * @since 1.2.4
+     * @deprecated 12.0.0
+     *
+     * @param string $url Link for the logged-in user's profile.
+     */
+    return apply_filters_deprecated( 'bp_get_loggedin_user_link', array( $url ), '12.0.0', 'bp_loggedin_user_url' );
+}
+
+/**
+ * Get the link for the displayed user's profile.
+ *
+ * @since 1.0.0
+ * @deprecated 12.0.0
+ *
+ * @return string
+ */
+function bp_get_displayed_user_link() {
+    _deprecated_function( __FUNCTION__, '12.0.0', 'bp_displayed_user_url()' );
+    $url = bp_displayed_user_url();
+
+    /**
+     * Filters the link for the displayed user's profile.
+     *
+     * @since 1.2.4
+     * @deprecated 12.0.0
+     *
+     * @param string $url Link for the displayed user's profile.
+     */
+    return apply_filters_deprecated( 'bp_get_displayed_user_link', array( $url ), '12.0.0', 'bp_displayed_user_url' );
+}
+
+/**
+ * Alias of {@link bp_displayed_user_domain()}.
+ *
+ * @deprecated 12.0.0
+ */
+function bp_user_link() {
+    _deprecated_function( __FUNCTION__, '12.0.0', 'bp_displayed_user_url()' );
+    bp_displayed_user_url();
+}
+
+/**
+ * Output blog directory permalink.
+ *
+ * @since 1.5.0
+ * @deprecated 12.0.0
+ */
+function bp_blogs_directory_permalink() {
+    _deprecated_function( __FUNCTION__, '12.0.0', 'bp_blogs_directory_url()' );
+    bp_blogs_directory_url();
+}
+
+/**
+ * Return blog directory permalink.
+ *
+ * @since 1.5.0
+ * @deprecated 12.0.0
+ *
+ * @return string The URL of the Blogs directory.
+ */
+function bp_get_blogs_directory_permalink() {
+    _deprecated_function( __FUNCTION__, '12.0.0', 'bp_get_blogs_directory_url()' );
+    $url = bp_get_blogs_directory_url();
+
+    /**
+     * Filters the blog directory permalink.
+     *
+     * @since 1.5.0
+     * @deprecated 12.0.0
+     *
+     * @param string $url Permalink URL for the blog directory.
+     */
+    return apply_filters_deprecated( 'bp_get_blogs_directory_permalink', array( $url ), '12.0.0', 'bp_get_blogs_directory_url' );
+}

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

@@ -341 +341 @@
         array(
             'single_item_component' => bp_rewrites_get_slug( 'members', 'member_groups', bp_get_groups_slug() ),
+            'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_groups_invites', 'invites' ),
         )
     );
@@ -359 +360 @@
     }
 
-    $args         = array(
+    $args = array(
         'tokens' => array(
             'group'          => $group,
@@ -367 +368 @@
             'inviter.url'    => bp_members_get_user_url( $inviter_user_id ),
             'inviter.id'     => $inviter_user_id,
-            'invites.url'    => esc_url( $invited_link . '/invites/' ),
+            'invites.url'    => esc_url( $invited_link ),
             'invite.message' => $invite_message,
             'unsubscribe'    => esc_url( bp_email_get_unsubscribe_link( $unsubscribe_args ) ),

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

@@ -96 +96 @@
 
 /**
+ * Output Groups directory's URL.
+ *
+ * @since 12.0.0
+ */
+function bp_groups_directory_url() {
+    echo esc_url( bp_get_groups_directory_url() );
+}
+
+/**
+ * Returns the Groups directory's URL.
+ *
+ * @since 12.0.0
+ *
+ * @param array $path_chunks {
+ *     An array of arguments. Optional.
+ *
+ *     @type int   $create_single_item `1` to get the create a group URL.
+ *     @type array $directory_type     The group type slug.
+ * }
+ * @return string The URL built for the BP Rewrites URL parser.
+ */
+function bp_get_groups_directory_url( $path_chunks = array() ) {
+    $supported_chunks = array_fill_keys( array( 'create_single_item', 'directory_type' ), true );
+
+    $path_chunks = bp_parse_args(
+        array_intersect_key( $path_chunks, $supported_chunks ),
+        array(
+            'component_id' => 'groups'
+        )
+    );
+
+    $url = bp_rewrites_get_url( $path_chunks );
+
+    /**
+     * Filters the Groups directory's URL.
+     *
+     * @since 12.0.0
+     *
+     * @param string  $url The Groups directory's URL.
+     * @param array   $path_chunks {
+     *     An array of arguments. Optional.
+     *
+     *      @type int   $create_single_item `1` to get the create a group URL.
+     *      @type array $directory_type     The group type slug.
+     * }
+     */
+    return apply_filters( 'bp_get_groups_directory_url', $url, $path_chunks );
+}
+
+/**
  * Output group directory permalink.
  *
  * @since 1.5.0
+ * @deprecated 12.0.0
  */
 function bp_groups_directory_permalink() {
-    echo esc_url( bp_get_groups_directory_permalink() );
+    _deprecated_function( __FUNCTION__, '12.0.0', 'bp_groups_directory_url()' );
+    bp_groups_directory_url();
 }
     /**
@@ -107 +159 @@
      *
      * @since 1.5.0
+     * @deprecated 12.0.0
      *
      * @return string
      */
     function bp_get_groups_directory_permalink() {
+        /*
+         * This function is used at many places and we need to review all this
+         * places during the 12.0 development cycle. Using BP Rewrites means we
+         * cannot concatenate URL chunks to build our URL anymore. We now need
+         * to use `bp_get_groups_directory_url( $array )` and make sure to use
+         * the right arguments inside this `$array`. Morevover as this function
+         * is also used to build a single group URL, we need to create a new
+         * function to create single group URLs using BP Rewrites.
+         *
+         * @todo Once every link reviewed, we'll be able to remove this check
+         *       and let PHPUnit tell us the one we forgot, eventually!
+         */
+        if ( ! buddypress()->is_phpunit_running ) {
+            _deprecated_function( __FUNCTION__, '12.0.0', 'bp_get_groups_directory_url()' );
+        }
+
+        $url = bp_get_groups_directory_url();
 
         /**
@@ -116 +186 @@
          *
          * @since 1.5.0
-         *
-         * @param string $value Permalink for the group directory.
-         */
-        return apply_filters( 'bp_get_groups_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ) );
+         * @deprecated 12.0.0
+         *
+         * @param string $url Permalink for the group directory.
+         */
+        return apply_filters_deprecated( 'bp_get_groups_directory_permalink', array( $url ), '12.0.0', 'bp_get_groups_directory_url' );
     }
 

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

@@ -239 +239 @@
             sprintf(
                 '<a href="%1$s">%2$s</a>',
-                esc_url( wp_login_url( bp_get_root_domain() ) ),
+                esc_url( wp_login_url( bp_get_root_url() ) ),
                 esc_html__( 'log in', 'buddypress' )
             )
@@ -311 +311 @@
                 sprintf(
                     '<a href="%1$s">%2$s</a>',
-                    esc_url( wp_login_url( bp_get_root_domain() ) ),
+                    esc_url( wp_login_url( bp_get_root_url() ) ),
                     esc_html__( 'log in', 'buddypress' )
                 ),
                 sprintf(
                     '<a href="%1$s">%2$s</a>',
-                    esc_url( wp_lostpassword_url( bp_get_root_domain() ) ),
+                    esc_url( wp_lostpassword_url( bp_get_root_url() ) ),
                     esc_html__( 'reset it', 'buddypress' )
                 )

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

@@ -145 +145 @@
  *
  * @param integer $user_id  The user ID.
- * @param array   $action {
+ * @param array   $path_chunks {
  *     An array of arguments. Optional.
  *
@@ -178 +178 @@
      * Filters the domain for the passed user.
      *
-     * @since 1.0.1
-     * @deprecated 12.0.0
-     *
-     * @param string $domain        Domain for the passed user.
-     * @param int    $user_id       ID of the passed user.
-     * @param string $user_nicename User nicename of the passed user.
-     * @param string $user_login    User login of the passed user.
-     */
-    $url = apply_filters_deprecated( 'bp_core_get_user_domain', array( $url, $user_id, false, false ), '12.0.0', 'bp_members_get_user_url' );
-
-    /**
-     * Filters the domain for the passed user.
-     *
      * @since 12.0.0
      *
@@ -327 +314 @@
         }
     }
-
-    /**
-     * Filters the username based on originally provided user ID.
-     *
-     * @since 1.0.1
-     * @deprecated 12.0.0
-     *
-     * @param string $slug Username determined by user ID.
-     */
-    $slug = apply_filters_deprecated( 'bp_core_get_username', array( $slug ), '12.0.0', 'bp_members_get_user_slug' );
 
     /**
@@ -2547 +2524 @@
     if ( $is_site_creation ) {
         if ( bp_is_active( 'blogs' ) ) {
-            $redirect_to = trailingslashit( bp_get_blogs_directory_permalink() . 'create' );
+            $url = bp_get_blogs_directory_url(
+                array(
+                    'create_single_item' => 1,
+                )
+            );
+
+            $redirect_to = trailingslashit( $url );
         } else {
             // Perform no redirect in this case.

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

@@ -141 +141 @@
      */
     function bp_get_members_directory_permalink() {
+        $url = bp_rewrites_get_url(
+            array(
+                'component_id' => 'members',
+            )
+        );
 
         /**
@@ -147 +152 @@
          * @since 1.5.0
          *
-         * @param string $value Members directory permalink.
-         */
-        return apply_filters( 'bp_get_members_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) );
+         * @param string $url Members directory permalink.
+         */
+        return apply_filters( 'bp_get_members_directory_permalink', $url );
     }
 
@@ -186 +191 @@
         }
 
+        $url = bp_rewrites_get_url(
+            array(
+                'component_id'   => 'members',
+                'directory_type' => $type->directory_slug,
+            )
+        );
+
         /**
          * Filters the member type directory permalink.
@@ -191 +203 @@
          * @since 2.5.0
          *
-         * @param string $value       Member type directory permalink.
+         * @param string $url         Member type directory permalink.
          * @param object $type        Member type object.
          * @param string $member_type Member type name, as passed to the function.
          */
-        return apply_filters( 'bp_get_member_type_directory_permalink', trailingslashit( bp_get_members_directory_permalink() . bp_get_members_member_type_base() . '/' . $type->directory_slug ), $type, $member_type );
+        return apply_filters( 'bp_get_member_type_directory_permalink', $url, $type, $member_type );
     }
 
@@ -1458 +1470 @@
 
     // Always add a log out list item to the end of the navigation.
-    $logout_link = '<li><a id="wp-logout" href="' .  wp_logout_url( bp_get_root_domain() ) . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
+    $logout_link = '<li><a id="wp-logout" href="' .  wp_logout_url( bp_get_root_url() ) . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
 
     echo apply_filters( 'bp_logout_nav_link', $logout_link );
@@ -1852 +1864 @@
 
 /**
- * Output the link for the logged-in user's profile.
- *
- * @since 1.2.4
- */
-function bp_loggedin_user_link() {
-    echo esc_url( bp_get_loggedin_user_link() );
-}
-    /**
-     * Get the link for the logged-in user's profile.
-     *
-     * @since 1.0.0
-     *
-     * @return string
-     */
-    function bp_get_loggedin_user_link() {
-
-        /**
-         * Filters the link for the logged-in user's profile.
-         *
-         * @since 1.2.4
-         *
-         * @param string $value Link for the logged-in user's profile.
-         */
-        return apply_filters( 'bp_get_loggedin_user_link', bp_loggedin_user_domain() );
-    }
-
-/**
- * Output the link for the displayed user's profile.
- *
- * @since 1.2.4
- */
-function bp_displayed_user_link() {
-    echo esc_url( bp_get_displayed_user_link() );
-}
-    /**
-     * Get the link for the displayed user's profile.
-     *
-     * @since 1.0.0
-     *
-     * @return string
-     */
-    function bp_get_displayed_user_link() {
-
-        /**
-         * Filters the link for the displayed user's profile.
-         *
-         * @since 1.2.4
-         *
-         * @param string $value Link for the displayed user's profile.
-         */
-        return apply_filters( 'bp_get_displayed_user_link', bp_displayed_user_domain() );
-    }
-
-    /**
-     * Alias of {@link bp_displayed_user_domain()}.
-     *
-     * @deprecated
-     */
-    function bp_user_link() {
-        bp_displayed_user_domain();
-    }
-
-/**
  * Alias of {@link bp_displayed_user_id()}.
  *
@@ -1924 +1873 @@
 
 /**
+ * Output the link for the displayed user's profile.
+ *
+ * @since 1.2.4
+ */
+function bp_displayed_user_link() {
+    echo esc_url( bp_displayed_user_url() );
+}
+
+/**
+ * Builds the logged-in user's profile URL.
+ *
+ * @since 12.0.0
+ *
+ * @param array $path_chunks {
+ *     An array of arguments. Optional.
+ *
+ *     @type string $single_item_component        The component slug the action is relative to.
+ *     @type string $single_item_action           The slug of the action to perform.
+ *     @type array  $single_item_action_variables An array of additional informations about the action to perform.
+ * }
+ * @return string The logged-in user's profile URL.
+ */
+function bp_displayed_user_url( $path_chunks = array() ) {
+    $bp  = buddypress();
+    $url = '';
+
+    if ( isset( $bp->displayed_user->domain ) ) {
+        $url = $bp->displayed_user->domain;
+    }
+
+    if ( $path_chunks ) {
+        $url = bp_members_get_user_url( bp_displayed_user_id(), $path_chunks );
+    }
+
+    /**
+     * Filter here to edit the displayed user's profile URL.
+     *
+     * @since 12.0.0
+     *
+     * @param string $url         The displayed user's profile URL.
+     * @param array  $path_chunks {
+     *     An array of arguments. Optional.
+     *
+     *     @type string $single_item_component        The component slug the action is relative to.
+     *     @type string $single_item_action           The slug of the action to perform.
+     *     @type array  $single_item_action_variables An array of additional informations about the action to perform.
+     * }
+     */
+    return apply_filters( 'bp_displayed_user_url', $url, $path_chunks );
+}
+
+/**
  * Generate the link for the displayed user's profile.
  *
  * @since 1.0.0
- *
+ * @since 12.0.0 This function is now an alias of `bp_displayed_user_url()`.
+ *               You should only use it to get the "home" URL of the displayed
+ *               user's profile page. If you need to build an URL to reach another
+ *               page, we strongly advise you to use `bp_displayed_user_url()`.
+ *
+ * @todo Deprecating this function would be safer.
  * @return string
  */
 function bp_displayed_user_domain() {
-    $bp = buddypress();
+    $url = bp_displayed_user_url();
 
     /**
@@ -1938 +1944 @@
      * @since 1.0.0
      *
-     * @param string $value Generated link for the displayed user's profile.
-     */
-    return apply_filters( 'bp_displayed_user_domain', isset( $bp->displayed_user->domain ) ? $bp->displayed_user->domain : '' );
+     * @param string $url Generated link for the displayed user's profile.
+     */
+    return apply_filters( 'bp_displayed_user_domain',$url );
+}
+
+/**
+ * Output the link for the logged-in user's profile.
+ *
+ * @since 1.2.4
+ */
+function bp_loggedin_user_link() {
+    echo esc_url( bp_loggedin_user_url() );
+}
+
+/**
+ * Builds the logged-in user's profile URL.
+ *
+ * @since 12.0.0
+ *
+ * @param array $path_chunks {
+ *     An array of arguments. Optional.
+ *
+ *     @type string $single_item_component        The component slug the action is relative to.
+ *     @type string $single_item_action           The slug of the action to perform.
+ *     @type array  $single_item_action_variables An array of additional informations about the action to perform.
+ * }
+ * @return string The logged-in user's profile URL.
+ */
+function bp_loggedin_user_url( $path_chunks = array() ) {
+    $bp  = buddypress();
+    $url = '';
+
+    if ( isset( $bp->loggedin_user->domain ) ) {
+        $url = $bp->loggedin_user->domain;
+    }
+
+    if ( $path_chunks ) {
+        $url = bp_members_get_user_url( bp_loggedin_user_id(), $path_chunks );
+    }
+
+    /**
+     * Filter here to edit the logged-in user's profile URL.
+     *
+     * @since 12.0.0
+     *
+     * @param string $url         The logged-in user's profile URL.
+     * @param array  $path_chunks {
+     *     An array of arguments. Optional.
+     *
+     *     @type string $single_item_component        The component slug the action is relative to.
+     *     @type string $single_item_action           The slug of the action to perform.
+     *     @type array  $single_item_action_variables An array of additional informations about the action to perform.
+     * }
+     */
+    return apply_filters( 'bp_loggedin_user_url', $url, $path_chunks );
 }
 
@@ -1947 +2005 @@
  *
  * @since 1.0.0
- *
+ * @since 12.0.0 This function is now an alias of `bp_loggedin_user_url()`.
+ *               You should only use it to get the "home" URL of the logged-in
+ *               user's profile page. If you need to build an URL to reach another
+ *               page, we strongly advise you to use `bp_loggedin_user_url()`.
+ *
+ * @todo Deprecating this function would be safer.
  * @return string
  */
 function bp_loggedin_user_domain() {
-    $bp = buddypress();
+    $url = bp_loggedin_user_url();
 
     /**
@@ -1958 +2021 @@
      * @since 1.0.0
      *
-     * @param string $value Generated link for the logged-in user's profile.
-     */
-    return apply_filters( 'bp_loggedin_user_domain', isset( $bp->loggedin_user->domain ) ? $bp->loggedin_user->domain : '' );
+     * @param string $url Generated link for the logged-in user's profile.
+     */
+    return apply_filters( 'bp_loggedin_user_domain', $url );
 }
 
@@ -2347 +2410 @@
     function bp_get_signup_page() {
         if ( bp_has_custom_signup_page() ) {
-            $page = trailingslashit( bp_get_root_domain() . '/' . bp_get_signup_slug() );
+            $page = bp_rewrites_get_url(
+                array(
+                    'component_id'    => 'members',
+                    'member_register' => 1,
+                )
+            );
+
         } else {
-            $page = bp_get_root_domain() . '/wp-signup.php';
+            $page = trailingslashit( bp_get_root_url() ) . 'wp-signup.php';
         }
 
@@ -2396 +2465 @@
     function bp_get_activation_page() {
         if ( bp_has_custom_activation_page() ) {
-            $page = trailingslashit( bp_get_root_domain() . '/' . bp_get_activate_slug() );
+            $page = bp_rewrites_get_url(
+                array(
+                    'component_id'    => 'members',
+                    'member_activate' => 1,
+                )
+            );
+
         } else {
-            $page = trailingslashit( bp_get_root_domain() ) . 'wp-activate.php';
+            $page = trailingslashit( bp_get_root_url() ) . 'wp-activate.php';
         }
 
@@ -3566 +3641 @@
         if ( 0 === $user_id ) {
             $user_id = bp_loggedin_user_id();
-            $domain  = bp_loggedin_user_domain();
-        } else {
-            $domain = bp_members_get_user_url( (int) $user_id );
-        }
-
-        $retval = trailingslashit( $domain . bp_get_members_invitations_slug() . '/list-invites' );
+        }
+
+        $retval = bp_members_get_user_url(
+            (int) $user_id,
+            array(
+                'single_item_component' => bp_rewrites_get_slug( 'members', 'member_invitations', bp_get_members_invitations_slug() ),
+                'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_invitations_list_invites', 'list-invites' ),
+            )
+        );
 
         /**
@@ -3605 +3683 @@
         if ( 0 === $user_id ) {
             $user_id = bp_loggedin_user_id();
-            $domain  = bp_loggedin_user_domain();
-        } else {
-            $domain = bp_members_get_user_url( (int) $user_id );
-        }
-
-        $retval = trailingslashit( $domain . bp_get_members_invitations_slug() . '/send-invites' );
+        }
+
+        $retval = bp_members_get_user_url(
+            (int) $user_id,
+            array(
+                'single_item_component' => bp_rewrites_get_slug( 'members', 'member_invitations', bp_get_members_invitations_slug() ),
+                'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_invitations_send_invites', 'send-invites' ),
+            )
+        );
 
         /**

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

@@ -215 +215 @@
     public function setup_additional_globals() {
         $bp = buddypress();
+
+        // 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 ***************************************************
@@ -784 +788 @@
 
     /**
+     * Add the Registration and Activation rewrite tags.
+     *
+     * @since 12.0.0
+     *
+     * @param array $rewrite_tags Optional. See BP_Component::add_rewrite_tags() for
+     *                            description.
+     */
+    public function add_rewrite_tags( $rewrite_tags = array() ) {
+        $rewrite_tags = array(
+            'member_register'     => '([1]{1,})',
+            'member_activate'     => '([1]{1,})',
+            'member_activate_key' => '([^/]+)',
+        );
+
+        parent::add_rewrite_tags( $rewrite_tags );
+    }
+
+    /**
+     * Add the Registration and Activation rewrite rules.
+     *
+     * @since 12.0.0
+     *
+     * @param array $rewrite_rules Optional. See BP_Component::add_rewrite_rules() for
+     *                             description.
+     */
+    public function add_rewrite_rules( $rewrite_rules = array() ) {
+        $rewrite_rules = array(
+            'directory_type'      => array(
+                'regex' => $this->root_slug . '/' . bp_get_members_member_type_base() . '/([^/]+)/?$',
+                'order' => 50,
+                'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['directory_type'] . '=$matches[1]',
+            ),
+            'member_activate'     => array(
+                'regex' => bp_get_activate_slug(),
+                'order' => 40,
+                'query' => 'index.php?' . $this->rewrite_ids['member_activate'] . '=1',
+            ),
+            'member_activate_key' => array(
+                'regex' => bp_get_activate_slug() . '/([^/]+)/?$',
+                'order' => 30,
+                'query' => 'index.php?' . $this->rewrite_ids['member_activate'] . '=1&' . $this->rewrite_ids['member_activate_key'] . '=$matches[1]',
+            ),
+            'member_register'     => array(
+                'regex' => bp_get_signup_slug(),
+                'order' => 20,
+                'query' => 'index.php?' . $this->rewrite_ids['member_register'] . '=1',
+            ),
+        );
+
+        parent::add_rewrite_rules( $rewrite_rules );
+    }
+
+    /**
+     * Add the Registration and Activation permastructs.
+     *
+     * @since 12.0.0
+     *
+     * @param array $permastructs Optional. See BP_Component::add_permastructs() for
+     *                            description.
+     */
+    public function add_permastructs( $permastructs = array() ) {
+        $permastructs = array(
+            // Register permastruct.
+            $this->rewrite_ids['member_register'] => array(
+                'permastruct' => $this->register_permastruct,
+                'args'        => array(),
+            ),
+            // Activate permastruct.
+            $this->rewrite_ids['member_activate'] => array(
+                'permastruct' => $this->activate_permastruct,
+                'args'        => array(),
+            ),
+        );
+
+        parent::add_permastructs( $permastructs );
+    }
+
+    /**
      * Init the BP REST API.
      *

trunk/src/bp-members/screens/activate.php

@@ -27 +27 @@
         $redirect_to = bp_is_component_front_page( 'activate' )
             ? bp_get_members_directory_permalink()
-            : bp_get_root_domain();
+            : bp_get_root_url();
 
         // Trailing slash it, as we expect these URL's to be.

trunk/src/bp-members/screens/register.php

@@ -28 +28 @@
         $redirect_to = bp_is_component_front_page( 'register' )
             ? bp_get_members_directory_permalink()
-            : bp_get_root_domain();
+            : bp_get_root_url();
 
         /**
@@ -158 +158 @@
                 // This situation doesn't naturally occur so bounce to website root.
             } else {
-                bp_core_redirect( bp_get_root_domain() );
+                bp_core_redirect( bp_get_root_url() );
             }
         }

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

@@ -338 +338 @@
         }
 
-        $domain = bp_members_get_user_url( $user_id );
+        $url = bp_members_get_user_url(
+            $user_id,
+            array(
+                'single_item_component'        => bp_rewrites_get_slug( 'members', 'member_messages', bp_get_messages_slug() ),
+                'single_item_action'           => bp_rewrites_get_slug( 'members', 'member_messages_view', 'view' ),
+                'single_item_action_variables' => array( $thread_id ),
+            )
+        );
 
         /**
@@ -347 +354 @@
          * @since 2.9.0 Added the `$user_id` parameter.
          *
-         * @param string $value     Permalink of a particular thread.
+         * @param string $url       Permalink of a particular thread.
          * @param int    $thread_id ID of the thread.
          * @param int    $user_id   ID of the user.
          */
-        return apply_filters( 'bp_get_message_thread_view_link', trailingslashit( $domain . bp_get_messages_slug() . '/view/' . $thread_id ), $thread_id, $user_id );
+        return apply_filters( 'bp_get_message_thread_view_link', $url, $thread_id, $user_id );
     }
 
@@ -383 +390 @@
         }
 
-        $domain = bp_members_get_user_url( $user_id );
+        $current_action_slug         = bp_current_action();
+        $current_action_rewrite_id   = 'member_messages_' . $current_action_slug;
+        $action_variable_delete_slug = bp_rewrites_get_slug( 'members', $current_action_rewrite_id . '_delete', 'delete' );
+
+        $url = bp_members_get_user_url(
+            $user_id,
+            array(
+                'single_item_component'        => bp_rewrites_get_slug( 'members', 'member_messages', bp_get_messages_slug() ),
+                'single_item_action'           => bp_rewrites_get_slug( 'members', $current_action_rewrite_id, $current_action_slug ),
+                'single_item_action_variables' => array( $action_variable_delete_slug, $messages_template->thread->thread_id ),
+            )
+        );
 
         /**
@@ -390 +408 @@
          * @since 1.0.0
          *
-         * @param string $value   URL for deleting the current thread.
+         * @param string $url   URL for deleting the current thread.
          * @param int    $user_id ID of the user relative to whom the link should be generated.
          */
-        return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( trailingslashit( $domain . bp_get_messages_slug() . '/' . bp_current_action() . '/delete/' . $messages_template->thread->thread_id ), 'messages_delete_thread' ), $user_id );
+        return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( $url, 'messages_delete_thread' ), $user_id );
     }
 
@@ -435 +453 @@
         }
 
-        $domain = bp_members_get_user_url( $user_id );
+        $current_action_slug         = bp_current_action();
+        $current_action_rewrite_id   = 'member_messages_' . $current_action_slug;
+        $action_variable_unread_slug = bp_rewrites_get_slug( 'members', $current_action_rewrite_id . '_unread', 'unread' );
 
         // Base unread URL.
-        $url = trailingslashit( $domain . bp_get_messages_slug() . '/' . bp_current_action() . '/unread' );
+        $url = bp_members_get_user_url(
+            $user_id,
+            array(
+                'single_item_component'        => bp_rewrites_get_slug( 'members', 'member_messages', bp_get_messages_slug() ),
+                'single_item_action'           => bp_rewrites_get_slug( 'members', $current_action_rewrite_id, $current_action_slug ),
+                'single_item_action_variables' => array( $action_variable_unread_slug ),
+            )
+        );
 
         // Add the args to the URL.
@@ -497 +524 @@
         }
 
-        $domain = bp_members_get_user_url( $user_id );
+        $current_action_slug         = bp_current_action();
+        $current_action_rewrite_id   = 'member_messages_' . $current_action_slug;
+        $action_variable_read_slug = bp_rewrites_get_slug( 'members', $current_action_rewrite_id . '_read', 'read' );
 
         // Base read URL.
-        $url = trailingslashit( $domain . bp_get_messages_slug() . '/' . bp_current_action() . '/read' );
+        $url = bp_members_get_user_url(
+            $user_id,
+            array(
+                'single_item_component'        => bp_rewrites_get_slug( 'members', 'member_messages', bp_get_messages_slug() ),
+                'single_item_action'           => bp_rewrites_get_slug( 'members', $current_action_rewrite_id, $current_action_slug ),
+                'single_item_action_variables' => array( $action_variable_read_slug ),
+            )
+        );
 
         // Add the args to the URL.

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

@@ -61 +61 @@
         if ( 0 === $user_id ) {
             $user_id = bp_loggedin_user_id();
-            $domain  = bp_loggedin_user_domain();
-        } else {
-            $domain = bp_members_get_user_url( (int) $user_id );
         }
 
-        $retval = trailingslashit( $domain . bp_get_notifications_slug() );
+        $retval = bp_members_get_user_url(
+            $user_id,
+            array(
+                'single_item_component' => bp_rewrites_get_slug( 'members', 'member_notifications', bp_get_notifications_slug() ),
+            )
+        );
 
         /**
@@ -102 +104 @@
         if ( 0 === $user_id ) {
             $user_id = bp_loggedin_user_id();
-            $domain  = bp_loggedin_user_domain();
-        } else {
-            $domain = bp_members_get_user_url( (int) $user_id );
         }
 
-        $retval = trailingslashit( $domain . bp_get_notifications_slug() . '/unread' );
+        $retval = bp_members_get_user_url(
+            $user_id,
+            array(
+                'single_item_component' => bp_rewrites_get_slug( 'members', 'member_notifications', bp_get_notifications_slug() ),
+                'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_notifications_unread', 'unread' ),
+            )
+        );
 
         /**
@@ -142 +147 @@
         if ( 0 === $user_id ) {
             $user_id = bp_loggedin_user_id();
-            $domain  = bp_loggedin_user_domain();
-        } else {
-            $domain = bp_members_get_user_url( (int) $user_id );
         }
 
-        $retval = trailingslashit( $domain . bp_get_notifications_slug() . '/read' );
+        $retval = bp_members_get_user_url(
+            $user_id,
+            array(
+                'single_item_component' => bp_rewrites_get_slug( 'members', 'member_notifications', bp_get_notifications_slug() ),
+                'single_item_action'    => bp_rewrites_get_slug( 'members', 'member_notifications_read', 'read' ),
+            )
+        );
 
         /**

trunk/src/bp-settings/actions/delete-account.php

@@ -59 +59 @@
 
         // Redirect to the root domain.
-        bp_core_redirect( bp_get_root_domain() );
+        bp_core_redirect( bp_get_root_url() );
     }
 }

trunk/src/bp-templates/bp-legacy/buddypress/members/activate.php

@@ -48 +48 @@
                     <?php
                     /* translators: %s: login url */
-                    printf( __( 'Your account was activated successfully! You can now <a href="%s">log in</a> with the username and password you provided when you signed up.', 'buddypress' ), wp_login_url( bp_get_root_domain() ) );
+                    printf( __( 'Your account was activated successfully! You can now <a href="%s">log in</a> with the username and password you provided when you signed up.', 'buddypress' ), wp_login_url( bp_get_root_url() ) );
                     ?>
                 </p>

trunk/src/bp-templates/bp-nouveau/buddypress/members/activate.php

@@ -27 +27 @@
             printf(
                 '<p><a href="%1$s">%2$s</a></p>',
-                esc_url( wp_login_url( bp_get_root_domain() ) ),
+                esc_url( wp_login_url( bp_get_root_url() ) ),
                 esc_html__( 'Log In', 'buddypress' )
             );

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

@@ -553 +553 @@
             }
 
+            $spam_link = bp_rewrites_get_url(
+                array(
+                    'component_id'                 => 'activity',
+                    'single_item_action'           => 'spam',
+                    'single_item_action_variables' => array( bp_get_activity_id() ),
+                )
+            );
+
             $buttons['activity_spam']['button_attr'][ $data_element ] = wp_nonce_url(
-                bp_get_root_domain() . '/' . bp_nouveau_get_component_slug( 'activity' ) . '/spam/' . $activity_id . '/',
+                bp_rewrites_get_url(
+                    array(
+                        'component_id'                 => 'activity',
+                        'single_item_action'           => 'spam',
+                        'single_item_action_variables' => array( $activity_id ),
+                    )
+                ),
                 'bp_activity_akismet_spam_' . $activity_id
             );
@@ -882 +896 @@
 
             $buttons['activity_comment_spam']['button_attr'][ $data_element ] = wp_nonce_url(
-                bp_get_root_domain() . '/' . bp_nouveau_get_component_slug( 'activity' ) . '/spam/' . $activity_comment_id . '/?cid=' . $activity_comment_id,
+                add_query_arg(
+                    'cid',
+                    $activity_comment_id,
+                    bp_rewrites_get_url(
+                        array(
+                            'component_id'                 => 'activity',
+                            'single_item_action'           => 'spam',
+                            'single_item_action_variables' => array( $activity_comment_id ),
+                        )
+                    )
+                ),
                 'bp_activity_akismet_spam_' . $activity_comment_id
             );

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

@@ -20 +20 @@
         'slug'      => 'all', // slug is used because BP_Core_Nav requires it, but it's the scope
         'li_class'  => array( 'selected' ),
-        'link'      => bp_get_root_domain() . '/' . bp_get_blogs_root_slug(),
+        'link'      => bp_get_blogs_directory_url(),
         'text'      => __( 'All Sites', 'buddypress' ),
         'count'     => bp_get_total_blog_count(),
@@ -44 +44 @@
         // If the user can create blogs, add the create nav
         if ( bp_blog_signup_enabled() ) {
+            $url = bp_get_blogs_directory_url(
+                array(
+                    'create_single_item' => 1,
+                )
+            );
+
             $nav_items['create'] = array(
                 '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'      => $url,
                 'text'      => __( 'Create a Site', 'buddypress' ),
                 'count'     => false,

trunk/tests/phpunit/includes/testcase.php

@@ -296 +296 @@
     public function go_to_root() {
         $blog_1_url = get_blog_option( 1, 'home' );
-        $this->go_to( str_replace( $blog_1_url, '', trailingslashit( bp_get_root_domain() ) ) );
+        $this->go_to( str_replace( $blog_1_url, '', trailingslashit( bp_get_root_url() ) ) );
     }
 

trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php

@@ -330 +330 @@
         // bp_activity_new_comment() doesn't allow date_recorded
         $a3 = bp_activity_add( array(
-            'action'            => sprintf( __( '%s posted a new activity comment', 'buddypress' ), bp_get_loggedin_user_link() ) ,
+            'action'            => sprintf( __( '%s posted a new activity comment', 'buddypress' ), bp_loggedin_user_url() ) ,
             'content'           => 'Candy is good',
             'component'         => buddypress()->activity->id,

trunk/tests/phpunit/testcases/activity/notifications.php

@@ -389 +389 @@
      */
     public function test_bp_activity_comment_add_notification() {
+        $this->set_permalink_structure( '/%postname%/' );
         $a = self::factory()->activity->create( array(
             'user_id' => $this->u1,

trunk/tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageId.php

@@ -7 +7 @@
  */
 class BP_Tests_Core_BpCoreGetDirectoryPageId extends BP_UnitTestCase {
+    protected $permalink_structure = '';
+
+    public function set_up() {
+        parent::set_up();
+        $this->permalink_structure = get_option( 'permalink_structure', '' );
+    }
+
+    public function tear_down() {
+        parent::tear_down();
+        $this->set_permalink_structure( $this->permalink_structure );
+    }
+
     public function test_should_fall_back_on_current_component() {
+        $this->set_permalink_structure( '/%postname%/' );
         $this->go_to( bp_get_activity_directory_permalink() );
 
@@ -17 +30 @@
 
     public function test_should_accept_component_override() {
+        $this->set_permalink_structure( '/%postname%/' );
         $this->go_to( bp_get_activity_directory_permalink() );
 

trunk/tests/phpunit/testcases/core/nav/backCompat.php

@@ -10 +10 @@
     protected $bp_nav;
     protected $bp_options_nav;
+    protected $permalink_structure = '';
 
     public function set_up() {
@@ -15 +16 @@
         $this->bp_nav = buddypress()->bp_nav;
         $this->bp_options_nav = buddypress()->bp_options_nav;
+        $this->permalink_structure = get_option( 'permalink_structure', '' );
     }
 
@@ -20 +22 @@
         buddypress()->bp_nav = $this->bp_nav;
         buddypress()->bp_options_nav = $this->bp_options_nav;
+        $this->set_permalink_structure( $this->permalink_structure );
         parent::tear_down();
     }
@@ -46 +49 @@
      */
     protected function set_up_group() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'slug' => 'testgroup',

trunk/tests/phpunit/testcases/core/nav/bpCoreMaybeHookNewSubnavScreenFunction.php

@@ -207 +207 @@
         $found = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
         $this->assertSame( 'failure', $found['status'] );
-        $this->assertSame( bp_get_root_domain(), $found['redirect_args']['root'] );
+        $this->assertSame( bp_get_root_url(), $found['redirect_args']['root'] );
 
         // Clean up

trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php

@@ -74 +74 @@
         $old_current_user = get_current_user_id();
         $this->set_current_user( $u );
+        $this->set_permalink_structure( '/%postname%/' );
 
         $group = groups_get_group( $g );

trunk/tests/phpunit/testcases/groups/class-bp-group-extension.php

@@ -8 +8 @@
  */
 class BP_Tests_Group_Extension_TestCases extends BP_UnitTestCase {
+    protected $permalink_structure = '';
+
+    public function set_up() {
+        parent::set_up();
+        $this->permalink_structure = get_option( 'permalink_structure', '' );
+    }
+
+    public function tear_down() {
+        parent::tear_down();
+        $this->set_permalink_structure( $this->permalink_structure );
+    }
+
     public function test_parse_legacy_properties() {
         $class_name = 'BPTest_Group_Extension_Parse_Legacy_Properties';
@@ -222 +234 @@
     public function test_enable_nav_item_true() {
         $old_options_nav = buddypress()->bp_options_nav;
+        $this->set_permalink_structure( '/%postname%/' );
 
         $g = self::factory()->group->create();
@@ -244 +257 @@
      */
     public function test_enable_nav_item_false() {
+        $this->set_permalink_structure( '/%postname%/' );
         $old_options_nav = buddypress()->bp_options_nav;
 
@@ -267 +281 @@
      */
     public function test_visibility_private() {
+        $this->set_permalink_structure( '/%postname%/' );
         $old_options_nav = buddypress()->bp_options_nav;
         $old_current_user = get_current_user_id();
@@ -311 +326 @@
      */
     public function test_visibility_public() {
+        $this->set_permalink_structure( '/%postname%/' );
         $old_options_nav = buddypress()->bp_options_nav;
         $old_current_user = get_current_user_id();
@@ -348 +364 @@
      */
     public function test_user_can_visit_inferred_from_enable_nav_item() {
+        $this->set_permalink_structure( '/%postname%/' );
         $old_current_user = get_current_user_id();
 
@@ -373 +390 @@
      */
     public function test_user_can_visit_explicit_for_logged_out_user() {
+        $this->set_permalink_structure( '/%postname%/' );
         $old_current_user = get_current_user_id();
         $this->set_current_user( 0 );
@@ -413 +431 @@
      */
     public function test_user_can_visit_explicit_for_logged_in_user() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -455 +474 @@
      */
     public function test_user_can_visit_explicit_for_group_member() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -499 +519 @@
      */
     public function test_user_can_visit_explicit_for_group_mod() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -545 +566 @@
      */
     public function test_user_can_visit_explicit_for_group_admin() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -591 +613 @@
      */
     public function test_user_can_see_nav_item_implied() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -632 +655 @@
      */
     public function test_user_can_see_nav_item_explicit_for_logged_out_user() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -673 +697 @@
      */
     public function test_user_can_see_nav_item_explicit_for_logged_in_user() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -715 +740 @@
      */
     public function test_user_can_see_nav_item_explicit_for_group_member() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -759 +785 @@
      */
     public function test_user_can_see_nav_item_explicit_for_group_mod() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -805 +832 @@
      */
     public function test_user_can_see_nav_item_explicit_for_group_admin() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -851 +879 @@
      */
     public function test_widget_on_group_home_page() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -872 +901 @@
      */
     public function test_widget_on_group_members_page() {
+        $this->set_permalink_structure( '/%postname%/' );
         $g = self::factory()->group->create( array(
             'status' => 'public',
@@ -893 +923 @@
      */
     public function test_adding_multiple_extension_classes() {
+        $this->set_permalink_structure( '/%postname%/' );
         $old_options_nav = buddypress()->bp_options_nav;
 

trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php

@@ -7 +7 @@
     static public $user_ids;
     static public $group_ids;
+    protected $permalink_structure = '';
+
+    public function set_up() {
+        parent::set_up();
+        $this->permalink_structure = get_option( 'permalink_structure', '' );
+    }
+
+    public function tear_down() {
+        parent::tear_down();
+        $this->set_permalink_structure( $this->permalink_structure );
+    }
 
     public static function wpSetUpBeforeClass( $factory ) {
@@ -161 +172 @@
      */
     public function test_bp_groups_user_can_send_invites() {
+        $this->set_permalink_structure( '/%postname%/' );
         $u_nonmembers = self::factory()->user->create();
         $u_members    = self::factory()->user->create();

trunk/tests/phpunit/testcases/members/template/bpGetMemberTypeDirectoryPermalink.php

@@ -6 +6 @@
  */
 class BP_Tests_Members_Template_BpGetMemberTypeDirectoryPermalink extends BP_UnitTestCase {
+    protected $permalink_structure = '';
+
     public function set_up() {
         parent::set_up();
 
         buddypress()->members->types = array();
+        $this->permalink_structure = get_option( 'permalink_structure', '' );
+    }
+
+    public function tear_down() {
+        parent::tear_down();
+
+        $this->set_permalink_structure( $this->permalink_structure );
     }
 
@@ -16 +25 @@
      */
     public function test_should_default_to_current_member_type() {
+        $this->set_permalink_structure( '/%postname%/' );
+
         bp_register_member_type( 'foo', array(
             'has_directory' => true,
@@ -31 +42 @@
      */
     public function test_member_type_param_should_override_current_member_type() {
+        $this->set_permalink_structure( '/%postname%/' );
+
         bp_register_member_type( 'foo', array(
             'has_directory' => true,
@@ -71 +84 @@
      */
     public function test_successful_format() {
+        $this->set_permalink_structure( '/%postname%/' );
+
         bp_register_member_type( 'foo', array(
             'has_directory' => true,