Ticket #4954: 4954.ray.01.patch

bp-core/bp-core-actions.php

@@ -64 +64 @@
  * The load order helps to execute code at the correct time.
  *                                                   v---Load order
  */
-add_action( 'bp_init', 'bp_core_set_uri_globals',    2  );
 add_action( 'bp_init', 'bp_setup_globals',           4  );
-add_action( 'bp_init', 'bp_setup_nav',               6  );
 add_action( 'bp_init', 'bp_setup_title',             8  );
 add_action( 'bp_init', 'bp_core_load_admin_bar_css', 12 );
 add_action( 'bp_init', 'bp_add_rewrite_tags',        20 );
@@ -74 +72 @@
 add_action( 'bp_init', 'bp_add_permastructs',        40 );
 
 /**
+ * bp_parse_query - Attached to 'parse_query' above
+ *
+ * Attach various query-related actions to the bp_parse_query action.
+ */
+add_action( 'bp_parse_query', 'bp_setup_nav', 10 );
+
+/**
  * bp_template_redirect - Attached to 'template_redirect' above
  *
  * Attach various template actions to the bp_template_redirect action.

bp-core/bp-core-catchuri.php

@@ -16 +16 @@
 /**
  * Analyze the URI and break it down into BuddyPress-usable chunks.
  *
- * BuddyPress can use complete custom friendly URIs without the user having to
- * add new rewrite rules. Custom components are able to use their own custom
- * URI structures with very little work.
+ * This isn't really used anymore.  Don't look or it will blind your eyes!
+ * Currently, only used on AJAX requests to determine the current_X items.
+ *
+ * Rewrite rules now take care of URI parsing.
  *
  * The URIs are broken down as follows:
  *   - http:// domain.com / members / andy / [current_component] / [current_action] / [action_variables] / [action_variables] / ...
@@ -312 +313 @@
 }
 
 /**
+ * Get a specific BuddyPress URI segment based on the current URI.
+ *
+ * For example, the following URI - /community/members/admin/activity/groups/:
+ *  'root_slug' will return 'community/members'
+ *  'item' will return 'admin'
+ *  'component' will return 'activity'
+ *  'action' will return 'groups'
+ *  'action_variables' will return anything after 'groups' if set
+ *
+ * Note: This set up resembles the members component only.  For groups, you'll
+ * have to manually shift various items around due to the inconsistency of
+ * BP's current_X convention across different components.
+ *
+ * You shouldn't really have to use this function unless you need to find a BP
+ * URI segment earlier than the 'parse_query' action.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param string $context See phpDoc.
+ * @return string|bool String on success. Boolean false on failure.
+ */
+function bp_core_get_from_uri( $context = 'item' ) {
+        // Don't do this on non-root blogs unless multiblog mode is on
+        if ( ! bp_is_root_blog() && ! bp_is_multiblog_mode() ) {
+                return false;
+        }
+
+        // get root slug if already queried
+        if ( ! empty( buddypress()->rewrite->root_slug ) && $context == 'root_slug' ) {
+                return buddypress()->rewrite->root_slug;
+
+        // get existing path if already calculated
+        } elseif ( ! empty( buddypress()->unfiltered_uri ) ) {
+                $path = buddypress()->unfiltered_uri;
+
+        // calculate the path
+        } else {
+                $site_path = bp_core_get_site_path();
+
+                // subdirectory install
+                if ( is_multisite() && ! is_subdomain_install() ) {
+                        global $current_blog;
+                        $site_path = $current_blog->path;
+                }
+
+                // strip site path from URI
+                $path = str_replace( $site_path, '', esc_url( $_SERVER['REQUEST_URI'] ) );
+
+                $bp_root_slugs = wp_list_pluck( (array) buddypress()->pages, 'slug' );
+
+                // search for any BP root slug and strip it if matched
+                foreach( $bp_root_slugs as $root_slug ) {
+                        if ( strpos( $path, $root_slug ) === 0 ) {
+                                if ( $context == 'root_slug' ) {
+                                        buddypress()->rewrite->root_slug = $root_slug;
+                                        return $root_slug;
+                                }
+
+                                $path = str_replace( $root_slug . '/', '', $path );
+                                break;
+                        }
+                }
+
+                // finally, split up the path
+                $path = array_filter( explode( '/', $path ) );
+
+                // save for later
+                buddypress()->unfiltered_uri = $path;
+        }
+
+        switch ( $context ) {
+                case 'component' :
+                        $key = 1;
+                        break;
+
+                case 'action' :
+                        $key = 2;
+                        break;
+
+                case 'action_variables' :
+                        unset( $path[0], $path[1], $path[2] );
+
+                        return ! empty( $path ) ? array_values( $path ) : array();
+                        break;
+
+                case 'item' :
+                default :
+                        $key = 0;
+                        break;
+        }
+
+        if ( empty( $path[$key] ) ) {
+                return false;
+        }
+
+        return $path[$key];
+}
+
+/**
  * Are root profiles enabled and allowed?
  *
  * @since BuddyPress (1.6.0)
@@ -329 +429 @@
 }
 
 /**
- * Load a specific template file with fallback support.
+ * Template loader support for the old bp-default theme.
+ *
+ * Do not use this function unless you want to support bp-default.  Developers
+ * new to BuddyPress can (and should) ignore this function.
  *
  * Example:
  *   bp_core_load_template( 'members/index' );
@@ -340 +443 @@
  * @return bool|null Returns false on failure.
  */
 function bp_core_load_template( $templates ) {
-        global $post, $bp, $wp_query, $wpdb;
-
-        // Determine if the root object WP page exists for this request
-        // note: get_page_by_path() breaks non-root pages
-        if ( !empty( $bp->unfiltered_uri_offset ) ) {
-                if ( !$page_exists = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s", $bp->unfiltered_uri[$bp->unfiltered_uri_offset] ) ) ) {
-                        return false;
-                }
-        }
-
-        // Set the root object as the current wp_query-ied item
-        $object_id = 0;
-        foreach ( (array) $bp->pages as $page ) {
-                if ( $page->name == $bp->unfiltered_uri[$bp->unfiltered_uri_offset] ) {
-                        $object_id = $page->id;
-                }
-        }
-
-        // Make the queried/post object an actual valid page
-        if ( !empty( $object_id ) ) {
-                $wp_query->queried_object    = get_post( $object_id );
-                $wp_query->queried_object_id = $object_id;
-                $post                        = $wp_query->queried_object;
-        }
-
         // Fetch each template and add the php suffix
         $filtered_templates = array();
         foreach ( (array) $templates as $template ) {
                 $filtered_templates[] = $template . '.php';
         }
 
-        // Filter the template locations so that plugins can alter where they are located
-        $located_template = apply_filters( 'bp_located_template', locate_template( (array) $filtered_templates, false ), $filtered_templates );
-        if ( !empty( $located_template ) ) {
+        // bp-default template lookup. will always exist!
+        if ( ! bp_use_theme_compat_with_current_theme() ) {
+                $template = locate_template( (array) $filtered_templates, false );
 
-                // Template was located, lets set this as a valid page and not a 404.
+        // theme compat doesn't require older bp-default so avoid unnecessary
+        // locate_template() call
+        } else {
+                $template = '';
+        }
+
+        // Filter the template locations so plugins can alter where they are located
+        $located_template = apply_filters( 'bp_located_template', $template, $filtered_templates );
+
+        if ( ! empty( $located_template ) ) {
+                // reset $wp_query properties
+                global $wp_query;
+                $wp_query->is_page = $wp_query->is_singular = true;
+                $wp_query->is_404  = false;
+
+                // Template was located, let's set this as a valid page and not a 404.
                 status_header( 200 );
-                $wp_query->is_page     = true;
-                $wp_query->is_singular = true;
-                $wp_query->is_404      = false;
 
                 do_action( 'bp_core_pre_load_template', $located_template );
 
@@ -389 +479 @@
 
                 // Kill any other output after this.
                 exit();
-
-        // No template found, so setup theme compatability
-        // @todo Some other 404 handling if theme compat doesn't kick in
-        } else {
-
-                // We know where we are, so reset important $wp_query bits here early.
-                // The rest will be done by bp_theme_compat_reset_post() later.
-                if ( is_buddypress() ) {
-                        status_header( 200 );
-                        $wp_query->is_page     = true;
-                        $wp_query->is_singular = true;
-                        $wp_query->is_404      = false;
-                }
-
-                do_action( 'bp_setup_theme_compat' );
         }
 }
 
@@ -555 +630 @@
 function bp_redirect_canonical() {
         global $bp;
 
-        if ( !bp_is_blog_page() && apply_filters( 'bp_do_redirect_canonical', true ) ) {
+        if ( ! bp_is_blog_page() && apply_filters( 'bp_do_redirect_canonical', true ) ) {
                 // If this is a POST request, don't do a canonical redirect.
                 // This is for backward compatibility with plugins that submit form requests to
                 // non-canonical URLs. Plugin authors should do their best to use canonical URLs in
@@ -565 +640 @@
                 }
 
                 // build the URL in the address bar
-                $requested_url  = bp_get_requested_url();
+                $requested_url = bp_get_requested_url();
 
                 // Stash query args
-                $url_stack      = explode( '?', $requested_url );
-                $req_url_clean  = $url_stack[0];
-                $query_args     = isset( $url_stack[1] ) ? $url_stack[1] : '';
+                $url_stack     = explode( '?', $requested_url );
+                $req_url_clean = $url_stack[0];
+
+                // Strip BP query vars from canonical URL
+                if ( ! empty( $url_stack[1] ) ) {
+                        wp_parse_str( $url_stack[1], $query_args );
+
+                        $sans_bp_query_args = array_diff_key( $query_args, array_flip( buddypress()->rewrite->registered_query_vars ) );
+
+                        // Put the querystring back together
+                        $url_stack[1] = http_build_query( $sans_bp_query_args );
+                }
+
+                $query_args    = isset( $url_stack[1] ) ? $url_stack[1] : '';
 
-                $canonical_url  = bp_get_canonical_url();
+                $canonical_url = bp_get_canonical_url();
 
                 // Only redirect if we've assembled a URL different from the request
                 if ( $canonical_url !== $req_url_clean ) {
@@ -731 +817 @@
         if ( ! bp_is_blog_page() )
                 remove_action( 'template_redirect', 'redirect_canonical' );
 }
-add_action( 'bp_init', '_bp_maybe_remove_redirect_canonical' );
+add_action( 'bp_parse_query', '_bp_maybe_remove_redirect_canonical' );
 
 /**
  * Rehook maybe_redirect_404() to run later than the default.

bp-core/bp-core-component.php

@@ -201 +201 @@
          *           names.
          *     @type array $meta_tables Optional. An array of metadata table
          *           names.
+         *     @type array $query_vars Optional. An array of query variables
+         *           used with rewrite rules.
          * }
          */
         public function setup_globals( $args = array() ) {
@@ -219 +221 @@
                         'search_string'         => '',
                         'global_tables'         => '',
                         'meta_tables'           => '',
+                        'query_vars'            => array(),
                 ) );
 
                 // Slug used for permalink URI chunk after root
@@ -236 +239 @@
                 // Notifications callback
                 $this->notification_callback = apply_filters( 'bp_' . $this->id . '_notification_callback', $r['notification_callback'] );
 
+                // Query variables used with rewrite rules
+                $this->query_vars            = (array) apply_filters( 'bp_' . $this->id . '_query_vars',    $r['query_vars'] );
+                buddypress()->rewrite->registered_query_vars = array_merge( buddypress()->rewrite->registered_query_vars, $this->query_vars );
+
                 // Set the global table names, if applicable
                 if ( ! empty( $r['global_tables'] ) ) {
                         $this->register_global_tables( $r['global_tables'] );
@@ -366 +373 @@
                 add_action( 'bp_add_permastructs',       array( $this, 'add_permastructs'       ), 10 );
 
                 // Allow components to parse the main query
-                add_action( 'bp_parse_query',            array( $this, 'parse_query'            ), 10 );
+                add_action( 'bp_parse_query',            array( $this, 'parse_query'            ), 8 );
 
                 // Generate rewrite rules
                 add_action( 'bp_generate_rewrite_rules', array( $this, 'generate_rewrite_rules' ), 10 );

bp-core/bp-core-rewrite.php

@@ +1 @@
+<?php
+/**
+ * Rewrite module.
+ *
+ * @package BuddyPress
+ * @subpackage Core
+ */
+
+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
+if ( class_exists( 'BP_Rewrite' ) ) return;
+
+/**
+ * BuddyPress Rewrite Class.
+ *
+ * The BuddyPress rewrite class is responsible for injecting rewrite rules
+ * into WordPress and for parsing various URI properties for use with BP
+ * when a rewrite rule matches.
+ *
+ * @package BuddyPress
+ * @subpackage Rewrite
+ *
+ * @since BuddyPress (2.0.0)
+ */
+class BP_Rewrite {
+        /**
+         * All of BP's registered query variables will be stored here.
+         *
+         * @var array
+         */
+        public $registered_query_vars = array();
+
+        /**
+         * Constructor.
+         */
+        public function __construct() {
+                add_filter( 'query_vars',                array( $this, 'query_vars' ) );
+                add_action( 'bp_generate_rewrite_rules', array( $this, 'rewrite_rules' ),      999 );
+                add_action( 'bp_parse_query',            array( $this, 'parse_query' ),        2 );
+                add_action( 'bp_init',                   array( $this, 'setup_ajax_globals' ), 2  );
+                add_action( 'posts_request',             array( $this, 'posts_request' ),      10, 2 );
+        }
+
+        /**
+         * Add custom rewrite rules for BuddyPress pages to WordPress.
+         *
+         * @param object $wp_rewrite The current WP_Rewrite instance.
+         */
+        public function rewrite_rules( $wp_rewrite ) {
+                // Don't add rewrite rules on non-root blogs unless multiblog mode is on
+                if ( ! bp_is_root_blog() && ! bp_is_multiblog_mode() ) {
+                        return;
+                }
+
+                if ( empty( buddypress()->pages ) ) {
+                        buddypress()->pages = bp_core_get_directory_pages();
+                }
+
+                $bp_rules = array();
+
+                // @todo test with various BP nested pages... might need to sort rewrite
+                //       rules according to length of root slug for priority reasons
+                // @todo support root profiles - can't see a decent way to do this
+                // @todo remove dependency on WP pages and use virtual pages?
+                //       for now, manually refresh permalinks when a BP page slug is altered
+                foreach ( buddypress()->pages as $component => $data ) {
+
+                        // directory page (eg. /members/)
+                        $bp_rules[ $data->slug . '/?$' ]        = 'index.php?bp_component=' . $component;
+
+                        // single page (eg. /members/*)
+                        // also matches all item and action variables under this single page
+                        $bp_rules[ $data->slug . '/([^?\#]*)' ] = 'index.php?bp_component=' . $component . '&bp_path=' . $wp_rewrite->preg_index( 1 );
+
+                }
+
+                $wp_rewrite->rules = array_merge( $bp_rules, $wp_rewrite->rules );
+        }
+
+        /**
+         * Set up various BP URI properties from the matched WP rewrite rules.
+         *
+         * @param object $query The current WP_Query instance.
+         */
+        public function parse_query( $query ) {
+                // if on frontpage and if BP page is frontpage, set the BP component
+                if ( $front_page_component = self::get_bp_frontpage_component_from_page_id( $query->query_vars['page_id'] ) ) {
+                        $query->set( 'bp_component', $front_page_component );
+                }
+
+                // if not on a BP page, stop now!
+                if ( ! $query->get( 'bp_component' ) ) {
+                        return;
+                }
+
+                // set 'current_component'
+                buddypress()->current_component = $query->get( 'bp_component' );
+
+                // set 'current_action' and 'action_variables'
+                if ( $query->get( 'bp_path' ) ) {
+                        // Break path into array
+                        $bp_path = array_filter( explode( '/', $query->get( 'bp_path' ) ) );
+
+                        // this is to keep backpat behavior with directory action pages
+                        // eg. /groups/create/
+                        //
+                        // the single current action is set in each component's loader
+                        buddypress()->current_action = array_shift( $bp_path );
+
+                        // this might be used in the future to support non-fancy permalinks
+                        $query->set( 'bp_action', buddypress()->current_action );
+
+                        if ( ! empty( $bp_path ) ) {
+                                buddypress()->action_variables = $bp_path;
+
+                                // this might be used in the future to support non-fancy permalinks
+                                $query->set( 'bp_action_variables', buddypress()->action_variables );
+                        }
+
+                // we're on a directory page
+                } else {
+                        buddypress()->is_directory = true;
+                }
+
+                // set as page
+                $query->is_page = true;
+
+                // not a 404
+                $query->is_404  = false;
+        }
+
+        /**
+         * Set up various BP URI properties when using AJAX.
+         *
+         * BP's URI globals now fires on the 'parse_query' hook.  The problem is
+         * 'parse_query' doesn't fire on AJAX requests.  So if you attempt to use a
+         * function like bp_is_current_action() during AJAX, it will not work.  This
+         * has the potential to break some plugins utilizing this behavior.
+         *
+         * Fortunately, our old URI globals function handles AJAX requests just fine,
+         * so let's bring it off the bench durng AJAX.
+         */
+        public function setup_ajax_globals() {
+                // stop if we're not on an ajax request
+                if ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && constant( 'DOING_AJAX') !== true ) ) {
+                        return;
+                }
+
+                // sigh... hello old friend, we're stuck with you at least for now.
+                bp_core_set_uri_globals();
+        }
+
+        /**
+         * Add our query vars to WordPress.
+         */
+        public function query_vars( $vars ) {
+                $this->registered_query_vars[] = 'bp_component';
+                $this->registered_query_vars[] = 'bp_path';
+
+                return array_merge( $this->registered_query_vars, $vars );
+        }
+
+        /**
+         * Change the SQL query when on a BP page.
+         *
+         * When we're on a BP page, a WP_Query loop is queried.  We don't want to
+         * fetch these posts, so set the query to fetch a simple query.
+         *
+         * @todo Is there a better way to do this?
+         *
+         * @param string $retval The current SQL statement
+         * @param object $query The current WP_Query instance.
+         * @return string SQL statement
+         */
+        public function posts_request( $retval, $query ) {
+                // if not on a BP page, stop now!
+                if ( ! $query->get( 'bp_component' ) ) {
+                        return $retval;
+                }
+
+                // change the query to fetch nothing instead of WP posts
+                // @todo is there a better way to do this without filtering 'posts_request'?
+                return "SELECT 'nothing'";
+        }
+
+        /**
+         * Get the BuddyPress component ID from a WP page ID.
+         *
+         * Perhaps move to bp-core-functions.php?
+         *
+         * @param int $page_id The WP page ID set as front page.
+         * @return string|bool String of component on success. Boolean false on failure.
+         */
+        public static function get_bp_frontpage_component_from_page_id( $page_id = 0 ) {
+                if ( get_option( 'show_on_front' ) != 'page' ) {
+                        return false;
+                }
+
+                if ( get_option( 'page_on_front' ) != $page_id ) {
+                        return false;
+                }
+
+                if ( empty( buddypress()->pages ) ) {
+                        buddypress()->pages = bp_core_get_directory_pages();
+                }
+
+                foreach ( buddypress()->pages as $component => $data ) {
+                        if ( $page_id == $data->id ) {
+                                return $component;
+                        }
+
+                }
+
+                return false;
+        }
+
+        /**
+         * Get the BuddyPress component ID if a BP page is set as frontpage.
+         *
+         * Perhaps move to bp-core-functions.php?
+         *
+         * @param int $page_id The WP page ID set as front page.
+         * @return string|bool String of component on success. Boolean false on failure.
+         */
+        public static function get_bp_frontpage_component() {
+                return self::get_bp_frontpage_component_from_page_id( get_option( 'page_on_front' ) );
+        }
+}

bp-core/bp-core-theme-compatibility.php

@@ -531 +531 @@
         $post = new WP_Post( (object) $dummy );
 
         // Copy the new post global into the main $wp_query
-        $wp_query->post       = $post;
-        $wp_query->posts      = array( $post );
+        $wp_query->post              = $post;
+        $wp_query->posts             = array( $post );
+        $wp_query->queried_object    = $post;
+        $wp_query->queried_object_id = $dummy['ID'];
 
         // Prevent comments form from appearing
         $wp_query->post_count = 1;
@@ -591 +593 @@
                 return $template;
         }
 
+        if ( bp_current_component() ) {
+                bp_set_theme_compat_active();
+                do_action( 'bp_setup_theme_compat' );
+        }
+
         /**
          * Use this action to execute code that will communicate to BuddyPress's
          * theme compatibility layer whether or not we're replacing the_content()

bp-groups/bp-groups-loader.php

@@ -151 +151 @@
                         'search_string'         => __( 'Search Groups...', 'buddypress' ),
                         'global_tables'         => $global_tables,
                         'meta_tables'           => $meta_tables,
+                        'query_vars'            => array( 'bp_group_id' ),
                 );
 
                 parent::setup_globals( $args );
 
-                /** Single Group Globals **********************************************/
+                /** Default Extension *************************************************/
 
-                // Are we viewing a single group?
-                if ( bp_is_groups_component() && $group_id = BP_Groups_Group::group_exists( bp_current_action() ) ) {
+                $this->default_extension = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'home' );
+
+                /** Single Group ******************************************************/
+
+                // Set up backpat globals for plugins relying on them to exist on 'bp_init'
+                $this->backpat_globals();
+
+                /** Misc **************************************************************/
+
+                // Illegal group names/slugs
+                $this->forbidden_names = apply_filters( 'groups_forbidden_names', array(
+                        'my-groups',
+                        'create',
+                        'invites',
+                        'send-invites',
+                        'forum',
+                        'delete',
+                        'add',
+                        'admin',
+                        'request-membership',
+                        'members',
+                        'settings',
+                        'avatar',
+                        $this->slug,
+                        $this->root_slug,
+                ) );
+
+                // Preconfigured group creation steps
+                $this->group_creation_steps = apply_filters( 'groups_create_group_steps', array(
+                        'group-details'  => array(
+                                'name'       => __( 'Details',  'buddypress' ),
+                                'position'   => 0
+                        ),
+                        'group-settings' => array(
+                                'name'       => __( 'Settings', 'buddypress' ),
+                                'position'   => 10
+                        )
+                ) );
+
+                // If avatar uploads are not disabled, add avatar option
+                if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] ) {
+                        $this->group_creation_steps['group-avatar'] = array(
+                                'name'     => __( 'Avatar',   'buddypress' ),
+                                'position' => 20
+                        );
+                }
+
+                // If friends component is active, add invitations
+                if ( bp_is_active( 'friends' ) ) {
+                        $this->group_creation_steps['group-invites'] = array(
+                                'name'     => __( 'Invites', 'buddypress' ),
+                                'position' => 30
+                        );
+                }
+
+                // Groups statuses
+                $this->valid_status = apply_filters( 'groups_valid_status', array(
+                        'public',
+                        'private',
+                        'hidden'
+                ) );
+
+                // Auto join group when non group member performs group activity
+                $this->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) && BP_DISABLE_AUTO_GROUP_JOIN ? false : true;
+        }
+
+
+        /**
+         * Parse the main query and set up some pertinent properties.
+         *
+         * @since BuddyPress (2.0.0)
+         *
+         * @param object The main WP_Query
+         */
+        public function parse_query( $query ) {
+                $bp = buddypress();
+
+                // the beginning of supporting non-fancy permalinks!
+                //
+                // still lots of work to do with our internal links to support querystrings
+                //
+                // you can use the following example:
+                //    domain.com/?bp_group_id=X
+                //
+                // and bp_redirect_canonical() will redirect to the pretty permalink
+                if ( $query->get( 'bp_group_id' ) && $group_slug = BP_Groups_Group::get_slug( $query->get( 'bp_group_id' ) ) ) {
+                        // set pertinent query vars
+                        $query->set( 'bp_component', 'groups' );
+                        $query->set( 'bp_path', $group_slug );
+                        $bp->current_action = $group_slug;
+                }
+
+                // if not on a groups page, stop now!
+                if ( $query->get( 'bp_component' ) !== 'groups' ) {
+                        return;
+                }
+
+                // if we're on the groups directory, stop now!
+                if ( ! $query->get( 'bp_path' ) ) {
+                        return;
+                }
+
+                /* single group *******************************************************/
+
+                // set up single group
+                //
+                // we're doing a conditional here to prevent requerying b/c we might have
+                // already set the current_group object.
+                //
+                // this is needed for unit tests to pass AND we should remove the
+                // backpat_setup_globals() method later when backpat is null and void!
+                if ( empty( $this->current_group->id ) ) {
+                        $group_id = BP_Groups_Group::group_exists( bp_current_action() );
 
                         $bp->is_single_item  = true;
                         $current_group_class = apply_filters( 'bp_groups_current_group_class', 'BP_Groups_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' );
+                // No group - reset group
+                if ( empty( $this->current_group->id ) ) {
+                        $bp->is_single_item = false;
+                        $this->current_group = 0;
 
+                // Group exists - set up single group properties and current_X items
+                } else {
                         // Is the logged in user a member of the group?
-                        if ( ( is_user_logged_in() && groups_is_user_member( bp_loggedin_user_id(), $this->current_group->id ) ) )
+                        if ( ( is_user_logged_in() && groups_is_user_member( bp_loggedin_user_id(), $this->current_group->id ) ) ) {
                                 $this->current_group->is_user_member = true;
-                        else
+                        } else {
                                 $this->current_group->is_user_member = false;
+                        }
 
                         // Should this group be visible to the logged in user?
-                        if ( 'public' == $this->current_group->status || $this->current_group->is_user_member )
+                        if ( 'public' == $this->current_group->status || $this->current_group->is_user_member ) {
                                 $this->current_group->is_visible = true;
-                        else
+                        } else {
                                 $this->current_group->is_visible = false;
+                        }
 
                         // If this is a private or hidden group, does the user have access?
                         if ( 'private' == $this->current_group->status || 'hidden' == $this->current_group->status ) {
@@ -202 +308 @@
                                 $this->current_group->user_has_access = true;
                         }
 
-                // Set current_group to 0 to prevent debug errors
-                } else {
-                        $this->current_group = 0;
-                }
-
-                // Illegal group names/slugs
-                $this->forbidden_names = apply_filters( 'groups_forbidden_names', array(
-                        'my-groups',
-                        'create',
-                        'invites',
-                        'send-invites',
-                        'forum',
-                        'delete',
-                        'add',
-                        'admin',
-                        'request-membership',
-                        'members',
-                        'settings',
-                        'avatar',
-                        $this->slug,
-                        $this->root_slug,
-                ) );
-
-                // If the user was attempting to access a group, but no group by that name was found, 404
-                if ( bp_is_groups_component() && empty( $this->current_group ) && bp_current_action() && !in_array( bp_current_action(), $this->forbidden_names ) ) {
-                        bp_do_404();
-                        return;
+                        // single group pages support a custom current_item property based on the URI
+                        // therefore, we have to shift all other current_X items up
+                        $bp->current_component = 'groups';
+                        $bp->current_item      = bp_current_action();
+                        $bp->current_action    = bp_action_variable( 0 );
+                        array_shift( $bp->action_variables );
                 }
 
-                if ( bp_is_groups_component() && !empty( $this->current_group ) ) {
+                /* canonical stuff *****************************************************/
 
-                        $this->default_extension = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'home' );
+                if ( ! empty( $this->current_group ) ) {
 
-                        if ( !bp_current_action() ) {
+                        if ( ! bp_current_action() ) {
                                 $bp->current_action = $this->default_extension;
                         }
 
@@ -259 +344 @@
 
                 }
 
-                // Group access control
-                if ( bp_is_groups_component() && !empty( $this->current_group ) ) {
-                        if ( !$this->current_group->user_has_access ) {
+                // if we're on a non-fancy link, a group exists and canonical redirect is on,
+                // stop the rest of this method since we need to get redirected anyway.
+                if ( $query->get( 'bp_group_id' ) && ! empty( $this->current_group ) && apply_filters( 'bp_do_redirect_canonical', true ) ) {
+                        return;
+                }
+
+                /* item admin **********************************************************/
+
+                // 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' );
+                }
+
+                /* group validation ***************************************************/
+
+                // If the user was attempting to access a group, but no group by that name was found, 404
+                if ( empty( $this->current_group ) && bp_current_action() && ! in_array( bp_current_action(), $this->forbidden_names ) ) {
+                        bp_do_404();
+                        return;
+                }
+
+                /** group access ******************************************************/
+
+                if ( !empty( $this->current_group ) ) {
+                        if ( ! $this->current_group->user_has_access ) {
 
                                 // Hidden groups should return a 404 for non-members.
                                 // Unset the current group so that you're not redirected
@@ -273 +387 @@
                                         return;
 
                                 // Skip the no_access check on home and membership request pages
-                                } elseif ( !bp_is_current_action( 'home' ) && !bp_is_current_action( 'request-membership' ) ) {
+                                } elseif ( ! bp_is_current_action( 'home' ) && ! bp_is_current_action( 'request-membership' ) ) {
 
                                         // Off-limits to this user. Throw an error and redirect to the group's home page
                                         if ( is_user_logged_in() ) {
@@ -291 +405 @@
                         }
 
                         // Protect the admin tab from non-admins
-                        if ( bp_is_current_action( 'admin' ) && !bp_is_item_admin() ) {
+                        if ( bp_is_current_action( 'admin' ) && ! bp_is_item_admin() ) {
                                 bp_core_no_access( array(
                                         'message'  => __( 'You are not an admin of this group.', 'buddypress' ),
                                         'root'     => bp_get_group_permalink( $bp->groups->current_group ),
@@ -300 +414 @@
                         }
                 }
 
-                // Preconfigured group creation steps
-                $this->group_creation_steps = apply_filters( 'groups_create_group_steps', array(
-                        'group-details'  => array(
-                                'name'       => __( 'Details',  'buddypress' ),
-                                'position'   => 0
-                        ),
-                        'group-settings' => array(
-                                'name'       => __( 'Settings', 'buddypress' ),
-                                'position'   => 10
-                        )
-                ) );
+                parent::parse_query( $query );
 
-                // If avatar uploads are not disabled, add avatar option
-                if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] ) {
-                        $this->group_creation_steps['group-avatar'] = array(
-                                'name'     => __( 'Avatar',   'buddypress' ),
-                                'position' => 20
-                        );
-                }
-
-                // If friends component is active, add invitations
-                if ( bp_is_active( 'friends' ) ) {
-                        $this->group_creation_steps['group-invites'] = array(
-                                'name'     => __( 'Invites', 'buddypress' ),
-                                'position' => 30
-                        );
-                }
-
-                // Groups statuses
-                $this->valid_status = apply_filters( 'groups_valid_status', array(
-                        'public',
-                        'private',
-                        'hidden'
-                ) );
-
-                // Auto join group when non group member performs group activity
-                $this->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) && BP_DISABLE_AUTO_GROUP_JOIN ? false : true;
         }
 
         /**
@@ -606 +685 @@
 
                 parent::setup_title();
         }
+
+        /**
+         * Set up some backwards-compatibility globals if we're on a group page.
+         *
+         * Before rewrite rules, we would set the current_X items on 'init'.  With
+         * rewrite rules, we set them on 'parse_query', which runs later and could
+         * potentially break functionality for plugins checking for current_X items on
+         * 'bp_init'.
+         *
+         * The current_X items are duplicated here using {@link bp_core_get_from_uri()} for
+         * backpat.  In a future release, we can remove this method entirely.
+         *
+         * @since BuddyPress (2.0.0)
+         */
+        protected function backpat_globals() {
+                $bp = buddypress();
+
+                if ( bp_core_get_from_uri( 'root_slug' ) == bp_get_groups_root_slug() ) {
+                        $bp->current_component = $this->slug;
+
+                        // we're on a single group page
+                        if ( $group_id = BP_Groups_Group::group_exists( urldecode( bp_core_get_from_uri( 'item' ) ) ) ) {
+
+                                $bp->is_single_item  = true;
+                                $current_group_class = apply_filters( 'bp_groups_current_group_class', 'BP_Groups_Group' );
+                                $this->current_group = apply_filters( 'bp_groups_current_group_object', new $current_group_class( $group_id ) );
+
+                                // backpat for plugins checking current_X items on 'bp_init'
+                                $bp->current_item     = bp_core_get_from_uri( 'item' );
+                                $bp->current_action   = bp_core_get_from_uri( 'component' );
+                                $bp->action_variables = (array) bp_core_get_from_uri( 'action' );
+                                array_unshift( $bp->action_variables, bp_core_get_from_uri( 'action_variables' ) );
+
+                                if ( ! bp_current_action() ) {
+                                        $bp->current_action = $this->default_extension;
+                                }
+
+                                // Is the logged in user a member of the group?
+                                if ( ( is_user_logged_in() && groups_is_user_member( bp_loggedin_user_id(), $this->current_group->id ) ) ) {
+                                        $this->current_group->is_user_member = true;
+                                } else {
+                                        $this->current_group->is_user_member = false;
+                                }
+
+                                // Should this group be visible to the logged in user?
+                                if ( 'public' == $this->current_group->status || $this->current_group->is_user_member ) {
+                                        $this->current_group->is_visible = true;
+                                } else {
+                                        $this->current_group->is_visible = false;
+                                }
+
+                                // If this is a private or hidden group, does the user have access?
+                                if ( 'private' == $this->current_group->status || 'hidden' == $this->current_group->status ) {
+                                        if ( $this->current_group->is_user_member && is_user_logged_in() || bp_current_user_can( 'bp_moderate' ) )
+                                                $this->current_group->user_has_access = true;
+                                        else
+                                                $this->current_group->user_has_access = false;
+                                } else {
+                                        $this->current_group->user_has_access = true;
+                                }
+
+                        // directory action
+                        // eg. /groups/create/
+                        } else {
+                                $bp->current_action = bp_core_get_from_uri( 'item' );
+                        }
+
+                }
+
+                if ( empty( $this->current_group ) ) {
+                        $this->current_group = 0;
+                }
+        }
 }
 
 

bp-loader.php

@@ -446 +446 @@
                 require( $this->plugin_dir . 'bp-core/bp-core-functions.php'  );
                 require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
                 require( $this->plugin_dir . 'bp-core/bp-core-loader.php'     );
+                require( $this->plugin_dir . 'bp-core/bp-core-rewrite.php'     );
 
                 // Skip or load deprecated content
                 if ( false !== $this->load_deprecated ) {
@@ -477 +478 @@
                 if ( bp_is_deactivation( $this->basename ) )
                         return;
 
+                // Set up rewrite rules
+                add_action( 'bp_loaded', array( $this, 'setup_rewrite_rules' ), 0 );
+
                 // Array of BuddyPress core actions
                 $actions = array(
                         'setup_theme',              // Setup the default theme compat
+                        'register_theme_directory', // Register the theme directory
+                        'register_theme_packages',  // Register bundled theme packages (bp-themes)
+                );
+
+                /*
+                        // these are not being used at the moment
                         'setup_current_user',       // Setup currently logged in user
                         'register_post_types',      // Register post types
                         'register_post_statuses',   // Register post statuses
                         'register_taxonomies',      // Register taxonomies
                         'register_views',           // Register the views
-                        'register_theme_directory', // Register the theme directory
-                        'register_theme_packages',  // Register bundled theme packages (bp-themes)
                         'load_textdomain',          // Load textdomain
                         'add_rewrite_tags',         // Add rewrite tags
                         'generate_rewrite_rules'    // Generate rewrite rules
-                );
+                */
 
                 // Add the actions
                 foreach( $actions as $class_action )
@@ -592 +600 @@
                 // Setup the theme package to use for compatibility
                 bp_setup_theme_compat( bp_get_theme_package_id() );
         }
+
+        /**
+         * Set up the rewrite rules to be used with BuddyPress.
+         *
+         * @since BuddyPress (2.0.0)
+         */
+        public function setup_rewrite_rules() {
+                $this->rewrite = new BP_Rewrite;
+        }
 }
 
 /**

bp-members/bp-members-loader.php

@@ -73 +73 @@
                         'root_slug'     => isset( $bp->pages->members->slug ) ? $bp->pages->members->slug : BP_MEMBERS_SLUG,
                         'has_directory' => true,
                         'search_string' => __( 'Search Members...', 'buddypress' ),
+                        'query_vars'    => array( 'bp_user_id' ),
                 ) );
 
+                /** Default Profile Component *****************************************/
+
+                if ( ! defined( 'BP_DEFAULT_COMPONENT' ) ) {
+                        if ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) ) {
+                                $bp->default_component = bp_get_activity_slug();
+                        } else {
+                                $bp->default_component = ( 'xprofile' === $bp->profile->id ) ? 'profile' : $bp->profile->id;
+                        }
+
+                } else {
+                        $bp->default_component = BP_DEFAULT_COMPONENT;
+                }
+
                 /** Logged in user ****************************************************/
 
                 // Fetch the full name for the logged in user
@@ -91 +105 @@
 
                 /** Displayed user ****************************************************/
 
-                // The domain for the user currently being displayed
-                $bp->displayed_user->domain   = bp_core_get_user_domain( bp_displayed_user_id() );
-
-                // The core userdata of the user who is currently being displayed
-                $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
-
-                // Fetch the full name displayed user
-                $bp->displayed_user->fullname = bp_core_get_user_displayname( bp_displayed_user_id() );
+                // Set up backpat globals for plugins relying on them to exist on 'bp_init'
+                $this->backpat_globals();
 
                 /** Signup ***************************************************/
                 $bp->signup = new stdClass;
@@ -111 +119 @@
                         $bp->profile->id   = 'profile';
                 }
 
-                /** Default Profile Component *****************************************/
+        }
 
-                if ( !defined( 'BP_DEFAULT_COMPONENT' ) ) {
-                        if ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) ) {
-                                $bp->default_component = bp_get_activity_slug();
+        /**
+         * Parse the main query and set up some pertinent properties.
+         *
+         * @since BuddyPress (2.0.0)
+         *
+         * @param object The main WP_Query
+         */
+        public function parse_query( $query ) {
+                $bp = buddypress();
+
+                // the beginning of supporting non-fancy permalinks!
+                //
+                // still lots of work to do with our internal links to support querystrings
+                //
+                // you can use the following example:
+                //    domain.com/?bp_user_id=X
+                //
+                // and bp_redirect_canonical() will redirect to pretty permalink
+                if ( $user_id = $query->get( 'bp_user_id' ) ) {
+                        $bp->displayed_user->id       = $user_id;
+                        $bp->displayed_user->userdata = get_user_by( 'id', $user_id );
+                        $bp->displayed_user->fullname = $bp->displayed_user->userdata->display_name;
+                        $bp->displayed_user->domain   = bp_core_get_user_domain( $user_id );
+
+                        // set pertinent query vars
+                        $query->set( 'bp_component', 'members' );
+                        $query->set( 'bp_path', bp_is_username_compatibility_mode() ? $bp->displayed_user->userdata->user_login : $bp->displayed_user->userdata->user_nicename );
+                }
+
+                // if not on a members page, stop now!
+                if ( $query->get( 'bp_component' ) !== 'members' ) {
+                        return;
+                }
+
+                // if we're on the members directory, stop now!
+                if ( ! $query->get( 'bp_path' ) ) {
+                        return;
+                }
+
+                // single member pages support a custom current_item property based on the URI
+                // as well as a custom current_component different than $this->id
+                //
+                // therefore, we have to shift all other current_X items up
+                $bp->current_item      = bp_current_action();
+                $bp->current_component = array_shift( $bp->action_variables );
+                $bp->current_action    = array_shift( $bp->action_variables );
+
+                /* displayed user ******************************************************/
+
+                // set up displayed user
+                //
+                // we're doing a conditional here to prevent requerying b/c we might have
+                // already set the displayed_user object.
+                //
+                // this is needed for unit tests to pass AND we should remove the
+                // backpat_setup_globals() method later when backpat is null and void!
+                if ( ! bp_displayed_user_id() ) {
+                        if ( bp_is_username_compatibility_mode() ) {
+                                $bp->displayed_user->id = (int) bp_core_get_userid( urldecode( $bp->current_item ) );
                         } else {
-                                $bp->default_component = ( 'xprofile' === $bp->profile->id ) ? 'profile' : $bp->profile->id;
+                                $bp->displayed_user->id = (int) bp_core_get_userid_from_nicename( urldecode( $bp->current_item ) );
                         }
 
-                } else {
-                        $bp->default_component = BP_DEFAULT_COMPONENT;
+                        // The domain for the user currently being displayed
+                        $bp->displayed_user->domain   = bp_core_get_user_domain( bp_displayed_user_id() );
+
+                        // The core userdata of the user who is currently being displayed
+                        $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
+
+                        // Fetch the full name displayed user
+                        $bp->displayed_user->fullname = bp_core_get_user_displayname( bp_displayed_user_id() );
+                }
+
+                // If no user, set displayed user properties to empty
+                if ( ! bp_displayed_user_id() ) {
+                        $bp->displayed_user->domain = $bp->displayed_user->userdata = $bp->displayed_user->fullname = false;
                 }
 
-                if ( bp_displayed_user_id() ) {
-                        $bp->canonical_stack['base_url'] = bp_displayed_user_domain();
+                /* canonical stuff *****************************************************/
 
-                        if ( bp_current_component() ) {
-                                $bp->canonical_stack['component'] = bp_current_component();
-                        }
+                $bp->canonical_stack['base_url'] = bp_displayed_user_domain();
 
-                        if ( bp_current_action() ) {
-                                $bp->canonical_stack['action'] = bp_current_action();
-                        }
+                if ( bp_current_component() ) {
+                        $bp->canonical_stack['component'] = bp_current_component();
+                }
 
-                        if ( !empty( $bp->action_variables ) ) {
-                                $bp->canonical_stack['action_variables'] = bp_action_variables();
-                        }
+                if ( bp_current_action() ) {
+                        $bp->canonical_stack['action'] = bp_current_action();
+                }
 
-                        if ( !bp_current_component() ) {
-                                $bp->current_component = $bp->default_component;
-                        } else if ( bp_is_current_component( $bp->default_component ) && !bp_current_action() ) {
-                                // The canonical URL will not contain the default component
-                                unset( $bp->canonical_stack['component'] );
-                        }
+                if ( !empty( $bp->action_variables ) ) {
+                        $bp->canonical_stack['action_variables'] = bp_action_variables();
+                }
 
-                        // if we're on a spammer's profile page, only users with the 'bp_moderate' cap
-                        // can view subpages on the spammer's profile
-                        //
-                        // users without the cap trying to access a spammer's subnav page will get
-                        // redirected to the root of the spammer's profile page.  this occurs by
-                        // by removing the component in the canonical stack.
-                        if ( bp_is_user_spammer( bp_displayed_user_id() ) && ! bp_current_user_can( 'bp_moderate' ) ) {
+                if ( ! bp_current_component() ) {
+                        $bp->current_component = $bp->default_component;
+
+                } else if ( bp_is_current_component( $bp->default_component ) && ! bp_current_action() ) {
+                        // The canonical URL will not contain the default component
+                        unset( $bp->canonical_stack['component'] );
+                }
+
+                /** user validation ***************************************************/
+
+                // user doesn't exist, set 404
+                if ( ! bp_displayed_user_id() ) {
+                        $bp->current_component = '';
+                        bp_do_404();
+                        return;
+
+                // if we're on a spammer's profile page, only users with the 'bp_moderate' cap
+                // can view subpages on the spammer's profile
+                //
+                // users without the cap trying to access a spammer's subnav page will get
+                // redirected to the root of the spammer's profile page.  this occurs by
+                // by removing the component in the canonical stack.
+                } elseif ( bp_is_user_spammer( bp_displayed_user_id() ) ) {
+                        if ( ! bp_current_user_can( 'bp_moderate' ) ) {
                                 unset( $bp->canonical_stack['component'] );
+                                $bp->current_component = '';
+                                bp_do_404();
+                                return;
+                        } else {
+                                bp_core_add_message( __( 'This user has been marked as a spammer. Only site admins can view this profile.', 'buddypress' ), 'warning' );
                         }
                 }
+
+                parent::parse_query( $query );
         }
 
         /**
@@ -165 +258 @@
                 $bp = buddypress();
 
                 // Add 'Profile' to the main navigation
-                if ( !bp_is_active( 'xprofile' ) ) {
+                if ( ! bp_is_active( 'xprofile' ) ) {
 
                         // Don't set up navigation if there's no user
-                        if ( !is_user_logged_in() && !bp_is_user() ) {
+                        if ( ! is_user_logged_in() && ! bp_is_user() ) {
                                 return;
                         }
 
@@ -220 +313 @@
 
                 parent::setup_title();
         }
+
+        /**
+         * Set up some backwards-compatibility globals if we're on a member page.
+         *
+         * Before rewrite rules, we would set the current_X items on 'init'.  With
+         * rewrite rules, we set them on 'parse_query', which runs later and could
+         * potentially break functionality for plugins checking for current_X items on
+         * 'bp_init'.
+         *
+         * The current_X items are duplicated here using {@link bp_core_get_from_uri()} for
+         * backpat.  In a future release, we can remove this method entirely.
+         *
+         * @since BuddyPress (2.0.0)
+         */
+        protected function backpat_globals() {
+                $bp = buddypress();
+
+                if ( bp_core_get_from_uri( 'root_slug' ) == bp_get_members_root_slug() ) {
+                        $bp->current_component = $this->slug;
+
+                        // we're on a single member page
+                        if ( $current_item = urldecode( bp_core_get_from_uri( 'item' ) ) ) {
+                                // set up displayed user ID
+                                if ( bp_is_username_compatibility_mode() ) {
+                                        $bp->displayed_user->id = (int) bp_core_get_userid( $current_item );
+                                } else {
+                                        $bp->displayed_user->id = (int) bp_core_get_userid_from_nicename( $current_item );
+                                }
+
+                                // The domain for the user currently being displayed
+                                $bp->displayed_user->domain   = bp_core_get_user_domain( bp_displayed_user_id() );
+
+                                // The core userdata of the user who is currently being displayed
+                                $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
+
+                                // Fetch the full name displayed user
+                                $bp->displayed_user->fullname = bp_core_get_user_displayname( bp_displayed_user_id() );
+
+                                // backpat for plugins checking current_X items on 'bp_init'
+                                $bp->current_component = bp_core_get_from_uri( 'component' );
+                                $bp->current_item      = bp_core_get_from_uri( 'item' );
+                                $bp->current_action    = bp_core_get_from_uri( 'action' );
+                                $bp->action_variables  = bp_core_get_from_uri( 'action_variables' );
+
+                                if ( ! bp_current_component() ) {
+                                        $bp->current_component = $bp->default_component;
+                                }
+                        }
+
+                } else {
+                        // Set displayed user properties to empty
+                        $bp->displayed_user->id     = 0;
+                        $bp->displayed_user->domain = $bp->displayed_user->userdata = $bp->displayed_user->fullname = false;
+                }
+
+        }
 }
 
 function bp_setup_members() {

tests/includes/testcase.php

@@ -142 +142 @@
                         $GLOBALS['blog_id'] = $GLOBALS['current_blog']->blog_id;
                 }
 
+                $this->flush_cache();
+                // For BuddyPress, James.
+                $GLOBALS['bp']->loggedin_user = NULL;
+                do_action( 'bp_init' );
+
                 unset($GLOBALS['wp_query'], $GLOBALS['wp_the_query']);
                 $GLOBALS['wp_the_query'] = new WP_Query();
                 $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
@@ -156 +161 @@
                 }
 
                 $GLOBALS['wp']->main($parts['query']);
-
-                // For BuddyPress, James.
-                $GLOBALS['bp']->loggedin_user = NULL;
-                do_action( 'bp_init' );
         }
 
         protected function checkRequirements() {

tests/testcases/routing/activity.php

@@ -9 +9 @@
         public function setUp() {
                 parent::setUp();
 
+                global $wp_rewrite;
+                $wp_rewrite->set_permalink_structure('/%postname%/');
+                $wp_rewrite->flush_rules();
+
                 $this->old_current_user = get_current_user_id();
                 $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
         }
@@ -16 +20 @@
         public function tearDown() {
                 parent::tearDown();
                 $this->set_current_user( $this->old_current_user );
+                $GLOBALS['wp_rewrite']->init();
         }
 
         function test_activity_directory() {

tests/testcases/routing/friends.php

@@ -9 +9 @@
         public function setUp() {
                 parent::setUp();
 
+                global $wp_rewrite;
+                $wp_rewrite->set_permalink_structure('/%postname%/');
+                $wp_rewrite->flush_rules();
+
                 $this->old_current_user = get_current_user_id();
                 $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
         }
@@ -16 +20 @@
         public function tearDown() {
                 parent::tearDown();
                 $this->set_current_user( $this->old_current_user );
+                $GLOBALS['wp_rewrite']->init();
         }
 
         function test_member_friends() {

tests/testcases/routing/groups.php

@@ -9 +9 @@
         public function setUp() {
                 parent::setUp();
 
+                global $wp_rewrite;
+                $wp_rewrite->set_permalink_structure('/%postname%/');
+                $wp_rewrite->flush_rules();
+
                 $this->old_current_user = get_current_user_id();
                 $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
         }
@@ -16 +20 @@
         public function tearDown() {
                 parent::tearDown();
                 $this->set_current_user( $this->old_current_user );
+                $GLOBALS['wp_rewrite']->init();
         }
 
         function test_member_groups() {

tests/testcases/routing/members.php

@@ -9 +9 @@
         public function setUp() {
                 parent::setUp();
 
+                global $wp_rewrite;
+                $wp_rewrite->set_permalink_structure('/%postname%/');
+                $wp_rewrite->flush_rules();
+
                 $this->old_current_user = get_current_user_id();
                 $this->set_current_user( $this->factory->user->create( array( 'user_login' => 'paulgibbs', 'role' => 'subscriber' ) ) );
         }
@@ -16 +20 @@
         public function tearDown() {
                 parent::tearDown();
                 $this->set_current_user( $this->old_current_user );
+                $GLOBALS['wp_rewrite']->init();
         }
 
         function test_members_directory() {

tests/testcases/routing/messages.php

@@ -9 +9 @@
         public function setUp() {
                 parent::setUp();
 
+                global $wp_rewrite;
+                $wp_rewrite->set_permalink_structure('/%postname%/');
+                $wp_rewrite->flush_rules();
+
                 $this->old_current_user = get_current_user_id();
                 $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
         }
@@ -16 +20 @@
         public function tearDown() {
                 parent::tearDown();
                 $this->set_current_user( $this->old_current_user );
+                $GLOBALS['wp_rewrite']->init();
         }
 
         function test_member_messages() {

tests/testcases/routing/settings.php

@@ -9 +9 @@
         public function setUp() {
                 parent::setUp();
 
+                global $wp_rewrite;
+                $wp_rewrite->set_permalink_structure('/%postname%/');
+                $wp_rewrite->flush_rules();
+
                 $this->old_current_user = get_current_user_id();
                 $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
         }
@@ -16 +20 @@
         public function tearDown() {
                 parent::tearDown();
                 $this->set_current_user( $this->old_current_user );
+                $GLOBALS['wp_rewrite']->init();
         }
 
         function test_member_settings() {

tests/testcases/routing/xprofile.php

@@ -9 +9 @@
         public function setUp() {
                 parent::setUp();
 
+                global $wp_rewrite;
+                $wp_rewrite->set_permalink_structure('/%postname%/');
+                $wp_rewrite->flush_rules();
+
                 $this->old_current_user = get_current_user_id();
                 $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
         }
@@ -16 +20 @@
         public function tearDown() {
                 parent::tearDown();
                 $this->set_current_user( $this->old_current_user );
+                $GLOBALS['wp_rewrite']->init();
         }
 
         function test_member_profile() {