Changeset 9936

Timestamp:

06/11/2015 06:53:59 AM (9 years ago)

Author:

johnjamesjacoby

Message:

Loaders: Micro-optimizations:

• Add brackets for improved readability
• Only instantiate $bp from buddypress() when used more than once, and after all early return conditions have executed
• Use _slug_ functions where appropriate, and avoid $this->slug references as they do not run filters
• Reduce mulitple calls to the same functions into 1 function call: I.E. bp_core_can_edit_settings()
• Remove BP_Core_Component::setup_nav() method - it's been handled and duplicated by BP_Members_Component for several years now, and only when XProfile is disabled
• Use new bp_get_profile_slug() functions where appropriate
• Use bp_core_number_format() where appropriate
• Avoid duplicate trailingslashit() calls on the same variables
• Rely on canonical menu URLs for all components

This change touches each component's -loader.php file and makes several small optimizations that avoid executing hundreds of function calls that return data (specifically gettext) that never gets used on logged-out users. This results in an approximate 20% reduction in time spent running our full unit test suite in my testing, and also improves site performance for logged-out users.

Location:

trunk

Files:

• src/bp-activity/bp-activity-loader.php (modified) (16 diffs)
• src/bp-blogs/bp-blogs-loader.php (modified) (9 diffs)
• src/bp-core/bp-core-loader.php (modified) (3 diffs)
• src/bp-forums/bp-forums-loader.php (modified) (9 diffs)
• src/bp-friends/bp-friends-loader.php (modified) (10 diffs)
• src/bp-groups/bp-groups-loader.php (modified) (17 diffs)
• src/bp-members/bp-members-filters.php (modified) (1 diff)
• src/bp-members/bp-members-loader.php (modified) (3 diffs)
• src/bp-messages/bp-messages-loader.php (modified) (13 diffs)
• src/bp-notifications/bp-notifications-loader.php (modified) (9 diffs)
• src/bp-settings/bp-settings-loader.php (modified) (10 diffs)
• src/bp-xprofile/bp-xprofile-activity.php (modified) (2 diffs)
• src/bp-xprofile/bp-xprofile-loader.php (modified) (7 diffs)
• src/bp-xprofile/bp-xprofile-screens.php (modified) (5 diffs)
• src/bp-xprofile/bp-xprofile-template.php (modified) (5 diffs)
• tests/phpunit/testcases/routing/xprofile.php (modified) (1 diff)
• tests/phpunit/testcases/xprofile/activity.php (modified) (1 diff)

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

@@ -46 +46 @@
      */
     public function includes( $includes = array() ) {
+
         // Files to include
         $includes = array(
@@ -90 +91 @@
 
         // Define a slug, if necessary
-        if ( !defined( 'BP_ACTIVITY_SLUG' ) )
+        if ( ! defined( 'BP_ACTIVITY_SLUG' ) ) {
             define( 'BP_ACTIVITY_SLUG', $this->id );
+        }
 
         // Global tables for activity component
@@ -136 +138 @@
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
-        // Add 'Activity' to the main navigation
-        $main_nav = array(
-            'name'                => _x( 'Activity', 'Profile activity screen nav', 'buddypress' ),
-            'slug'                => $this->slug,
-            'position'            => 10,
-            'screen_function'     => 'bp_activity_screen_my_activity',
-            'default_subnav_slug' => 'just-me',
-            'item_css_id'         => $this->id
-        );
-
         // Stop if there is no user displayed or logged in
-        if ( !is_user_logged_in() && !bp_displayed_user_id() )
+        if ( ! is_user_logged_in() && ! bp_displayed_user_id() ) {
             return;
+        }
 
         // Determine user to use
@@ -159 +152 @@
         }
 
-        // User link
-        $activity_link = trailingslashit( $user_domain . $this->slug );
+        $slug          = bp_get_activity_slug();
+        $activity_link = trailingslashit( $user_domain . $slug );
+
+        // Add 'Activity' to the main navigation
+        $main_nav = array(
+            'name'                => _x( 'Activity', 'Profile activity screen nav', 'buddypress' ),
+            'slug'                => $slug,
+            'position'            => 10,
+            'screen_function'     => 'bp_activity_screen_my_activity',
+            'default_subnav_slug' => 'just-me',
+            'item_css_id'         => $this->id
+        );
 
         // Add the subnav items to the activity nav item if we are using a theme that supports this
@@ -167 +170 @@
             'slug'            => 'just-me',
             'parent_url'      => $activity_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_activity_screen_my_activity',
             'position'        => 10
@@ -178 +181 @@
                 'slug'            => 'mentions',
                 'parent_url'      => $activity_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'bp_activity_screen_mentions',
                 'position'        => 20,
@@ -191 +194 @@
                 'slug'            => 'favorites',
                 'parent_url'      => $activity_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'bp_activity_screen_favorites',
                 'position'        => 30,
@@ -204 +207 @@
                 'slug'            => bp_get_friends_slug(),
                 'parent_url'      => $activity_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'bp_activity_screen_friends',
                 'position'        => 40,
@@ -217 +220 @@
                 'slug'            => bp_get_groups_slug(),
                 'parent_url'      => $activity_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'bp_activity_screen_groups',
                 'position'        => 50,
@@ -246 +249 @@
      */
     public function setup_admin_bar( $wp_admin_nav = array() ) {
-        $bp = buddypress();
 
         // Menus for logged in user
@@ -252 +254 @@
 
             // Setup the logged in user variables
-            $user_domain   = bp_loggedin_user_domain();
-            $activity_link = trailingslashit( $user_domain . $this->slug );
+            $activity_link = trailingslashit( bp_loggedin_user_domain() . bp_get_activity_slug() );
 
             // Unread message count
@@ -259 +260 @@
                 $count = bp_get_total_mention_count_for_user( bp_loggedin_user_id() );
                 if ( !empty( $count ) ) {
-                    $title = sprintf( _x( 'Mentions <span class="count">%s</span>', 'Toolbar Mention logged in user', 'buddypress' ), number_format_i18n( $count ) );
+                    $title = sprintf( _x( 'Mentions <span class="count">%s</span>', 'Toolbar Mention logged in user', 'buddypress' ), bp_core_number_format( $count ) );
                 } else {
                     $title = _x( 'Mentions', 'Toolbar Mention logged in user', 'buddypress' );
@@ -267 +268 @@
             // Add the "Activity" sub menu
             $wp_admin_nav[] = array(
-                'parent' => $bp->my_account_menu_id,
+                'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-' . $this->id,
                 'title'  => _x( 'Activity', 'My Account Activity sub nav', 'buddypress' ),
-                'href'   => trailingslashit( $activity_link )
+                'href'   => $activity_link
             );
 
@@ -278 +279 @@
                 'id'     => 'my-account-' . $this->id . '-personal',
                 'title'  => _x( 'Personal', 'My Account Activity sub nav', 'buddypress' ),
-                'href'   => trailingslashit( $activity_link )
+                'href'   => $activity_link
             );
 
@@ -336 +337 @@
      */
     public function setup_title() {
-        $bp = buddypress();
 
         // Adjust title based on view
         if ( bp_is_activity_component() ) {
+            $bp = buddypress();
+
             if ( bp_is_my_profile() ) {
                 $bp->bp_options_title = _x( 'My Activity', 'Page and <title>', 'buddypress' );
@@ -361 +363 @@
      */
     public function setup_actions() {
+
         // Spam prevention
         add_action( 'bp_include', 'bp_activity_setup_akismet' );

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

@@ -144 +144 @@
      */
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-        $bp = buddypress();
 
         /**
@@ -155 +154 @@
         }
 
-        // Add 'Sites' to the main navigation
-        $count    = (int) bp_get_total_blog_count_for_user();
-        $class    = ( 0 === $count ) ? 'no-count' : 'count';
-        $nav_text = sprintf( __( 'Sites <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count )  );
-        $main_nav = array(
-            'name'                => $nav_text,
-            'slug'                => $this->slug,
-            'position'            => 30,
-            'screen_function'     => 'bp_blogs_screen_my_blogs',
-            'default_subnav_slug' => 'my-sites',
-            'item_css_id'         => $this->id
-        );
-
         // Determine user to use
         if ( bp_displayed_user_domain() ) {
@@ -177 +163 @@
         }
 
-        $parent_url = trailingslashit( $user_domain . bp_get_blogs_slug() );
+        $slug       = bp_get_blogs_slug();
+        $parent_url = trailingslashit( $user_domain . $slug );
+
+        // Add 'Sites' to the main navigation
+        $count    = (int) bp_get_total_blog_count_for_user();
+        $class    = ( 0 === $count ) ? 'no-count' : 'count';
+        $nav_text = sprintf( __( 'Sites <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), bp_core_number_format( $count )  );
+        $main_nav = array(
+            'name'                => $nav_text,
+            'slug'                => $slug,
+            'position'            => 30,
+            'screen_function'     => 'bp_blogs_screen_my_blogs',
+            'default_subnav_slug' => 'my-sites',
+            'item_css_id'         => $this->id
+        );
 
         $sub_nav[] = array(
@@ -183 +183 @@
             'slug'            => 'my-sites',
             'parent_url'      => $parent_url,
-            'parent_slug'     => $bp->blogs->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_blogs_screen_my_blogs',
             'position'        => 10
@@ -203 +203 @@
      */
     public function setup_admin_bar( $wp_admin_nav = array() ) {
-        $bp = buddypress();
 
         /**
@@ -217 +216 @@
         if ( is_user_logged_in() ) {
 
-            $blogs_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
+            // Setup the logged in user variables
+            $blogs_link = trailingslashit( bp_loggedin_user_domain() . bp_get_blogs_slug() );
 
             // Add the "Sites" sub menu
             $wp_admin_nav[] = array(
-                'parent' => $bp->my_account_menu_id,
+                'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-' . $this->id,
                 'title'  => __( 'Sites', 'buddypress' ),
-                'href'   => trailingslashit( $blogs_link )
+                'href'   => $blogs_link
             );
 
@@ -232 +232 @@
                 'id'     => 'my-account-' . $this->id . '-my-sites',
                 'title'  => __( 'My Sites', 'buddypress' ),
-                'href'   => trailingslashit( $blogs_link )
+                'href'   => $blogs_link
             );
 
@@ -253 +253 @@
      */
     public function setup_title() {
-        $bp = buddypress();
 
         // Set up the component options navigation for Site
         if ( bp_is_blogs_component() ) {
+            $bp = buddypress();
+
             if ( bp_is_my_profile() ) {
                 if ( bp_is_active( 'xprofile' ) ) {
@@ -300 +301 @@
      */
     public function post_tracking_args( $params = null, $post_type = 0 ) {
+
         /**
          * Filters the post types to track for the Blogs component.

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

@@ -151 +151 @@
     public function includes( $includes = array() ) {
 
-        if ( !is_admin() )
+        if ( ! is_admin() ) {
             return;
+        }
 
         $includes = array(
@@ -179 +180 @@
 
         // Get the base database prefix
-        if ( empty( $bp->table_prefix ) )
+        if ( empty( $bp->table_prefix ) ) {
             $bp->table_prefix = bp_core_get_table_prefix();
+        }
 
         // The domain for the root of the site where the main blog resides
-        if ( empty( $bp->root_domain ) )
+        if ( empty( $bp->root_domain ) ) {
             $bp->root_domain = bp_core_get_root_domain();
+        }
 
         // Fetches all of the core BuddyPress settings in one fell swoop
-        if ( empty( $bp->site_options ) )
+        if ( empty( $bp->site_options ) ) {
             $bp->site_options = bp_core_get_root_options();
+        }
 
         // The names of the core WordPress pages used to display BuddyPress content
-        if ( empty( $bp->pages ) )
+        if ( empty( $bp->pages ) ) {
             $bp->pages = bp_core_get_directory_pages();
+        }
 
         /** Basic current user data *******************************************/
@@ -261 +266 @@
 
     /**
-     * Set up component navigation.
-     *
-     * @since BuddyPress (1.5.0)
-     *
-     * @see BP_Component::setup_nav() for a description of arguments.
-     *
-     * @param array $main_nav Optional. See BP_Component::setup_nav() for
-     *        description.
-     * @param array $sub_nav Optional. See BP_Component::setup_nav() for
-     *        description.
-     */
-    public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-        $bp = buddypress();
-
-         // If xprofile component is disabled, revert to WordPress profile
-        if ( !bp_is_active( 'xprofile' ) ) {
-
-            // Fallback values if xprofile is disabled
-            if ( ! isset( $bp->core->profile ) ) {
-                $bp->core->profile = new stdClass;
-            }
-            $bp->core->profile->slug = 'profile';
-            $bp->active_components[$bp->core->profile->slug] = $bp->core->profile->slug;
-
-            // Add 'Profile' to the main navigation
-            $main_nav = array(
-                'name'                => _x( 'Profile', 'Main navigation', 'buddypress' ),
-                'slug'                => $bp->core->profile->slug,
-                'position'            => 20,
-                'screen_function'     => 'bp_core_catch_profile_uri',
-                'default_subnav_slug' => 'public'
-            );
-
-            $profile_link = trailingslashit( bp_loggedin_user_domain() . '/' . $bp->core->profile->slug );
-
-            // Add the subnav items to the profile
-            $sub_nav[] = array(
-                'name'            => _x( 'View', 'Profile sub nav', 'buddypress' ),
-                'slug'            => 'public',
-                'parent_url'      => $profile_link,
-                'parent_slug'     => $bp->core->profile->slug,
-                'screen_function' => 'bp_core_catch_profile_uri'
-            );
-
-            parent::setup_nav( $main_nav, $sub_nav );
-        }
-    }
-
-    /**
      * Setup cache groups
      *

trunk/src/bp-forums/bp-forums-loader.php

@@ -50 +50 @@
 
         // Define the parent forum ID
-        if ( !defined( 'BP_FORUMS_PARENT_FORUM_ID' ) )
+        if ( ! defined( 'BP_FORUMS_PARENT_FORUM_ID' ) ) {
             define( 'BP_FORUMS_PARENT_FORUM_ID', 1 );
+        }
 
         // Define a slug, if necessary
-        if ( !defined( 'BP_FORUMS_SLUG' ) )
+        if ( ! defined( 'BP_FORUMS_SLUG' ) ) {
             define( 'BP_FORUMS_SLUG', $this->id );
+        }
 
         // The location of the bbPress stand-alone config file
         $bbconfig = bp_core_get_root_option( 'bb-config-location' );
-        if ( '' !== $bbconfig )
+        if ( '' !== $bbconfig ) {
             $this->bbconfig = $bbconfig;
+        }
 
         // All globals for messaging component.
@@ -95 +98 @@
 
         // bbPress stand-alone
-        if ( !defined( 'BB_PATH' ) )
+        if ( ! defined( 'BB_PATH' ) ) {
             $includes[] = 'bbpress-sa';
+        }
 
         // Admin-specific code
@@ -122 +126 @@
 
         // Stop if forums haven't been set up yet
-        if ( !bp_forums_is_installed_correctly() )
+        if ( ! bp_forums_is_installed_correctly() ) {
             return;
+        }
 
         // Stop if there is no user displayed or logged in
-        if ( !is_user_logged_in() && !bp_displayed_user_id() )
+        if ( ! is_user_logged_in() && ! bp_displayed_user_id() ) {
             return;
-
-        // Add 'Forums' to the main navigation
-        $main_nav = array(
-            'name'                => __( 'Forums', 'buddypress' ),
-            'slug'                => $this->slug,
-            'position'            => 80,
-            'screen_function'     => 'bp_member_forums_screen_topics',
-            'default_subnav_slug' => 'topics',
-            'item_css_id'         => $this->id
-        );
+        }
 
         // Determine user to use
@@ -149 +145 @@
 
         // User link
-        $forums_link = trailingslashit( $user_domain . $this->slug );
-
-        // Additional menu if friends is active
+        $slug        = bp_get_forums_slug();
+        $forums_link = trailingslashit( $user_domain . $slug );
+
+        // Add 'Forums' to the main navigation
+        $main_nav = array(
+            'name'                => __( 'Forums', 'buddypress' ),
+            'slug'                => $slug,
+            'position'            => 80,
+            'screen_function'     => 'bp_member_forums_screen_topics',
+            'default_subnav_slug' => 'topics',
+            'item_css_id'         => $this->id
+        );
+
+        // Topics started
         $sub_nav[] = array(
             'name'            => __( 'Topics Started', 'buddypress' ),
             'slug'            => 'topics',
             'parent_url'      => $forums_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_member_forums_screen_topics',
             'position'        => 20,
@@ -162 +169 @@
         );
 
-        // Additional menu if friends is active
+        // Topics replied to
         $sub_nav[] = array(
             'name'            => __( 'Replied To', 'buddypress' ),
             'slug'            => 'replies',
             'parent_url'      => $forums_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_member_forums_screen_replies',
             'position'        => 40,
@@ -192 +199 @@
 
             // Setup the logged in user variables
-            $forums_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
+            $forums_link = trailingslashit( bp_loggedin_user_domain() . bp_get_forums_slug() );
 
             // Add the "My Account" sub menus
@@ -199 +206 @@
                 'id'     => 'my-account-' . $this->id,
                 'title'  => __( 'Forums', 'buddypress' ),
-                'href'   => trailingslashit( $forums_link )
+                'href'   => $forums_link
             );
 
@@ -207 +214 @@
                 'id'     => 'my-account-' . $this->id . '-topics-started',
                 'title'  => __( 'Topics Started', 'buddypress' ),
-                'href'   => trailingslashit( $forums_link . 'topics' )
+                'href'   => $forums_link
             );
 
@@ -234 +241 @@
      */
     public function setup_title() {
-        $bp = buddypress();
 
         // Adjust title based on view
         if ( bp_is_forums_component() ) {
+            $bp = buddypress();
+
             if ( bp_is_my_profile() ) {
                 $bp->bp_options_title = __( 'Forums', 'buddypress' );

trunk/src/bp-friends/bp-friends-loader.php

@@ -76 +76 @@
 
         // Define a slug, if necessary
-        if ( !defined( 'BP_FRIENDS_SLUG' ) )
+        if ( ! defined( 'BP_FRIENDS_SLUG' ) ) {
             define( 'BP_FRIENDS_SLUG', $this->id );
+        }
 
         // Global tables for the friends component
@@ -111 +112 @@
      */
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-        $bp = buddypress();
-
-        // Add 'Friends' to the main navigation
-        $count    = friends_get_total_friend_count();
-        $class    = ( 0 === $count ) ? 'no-count' : 'count';
-        $main_nav = array(
-            'name'                => sprintf( __( 'Friends <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) ),
-            'slug'                => $this->slug,
-            'position'            => 60,
-            'screen_function'     => 'friends_screen_my_friends',
-            'default_subnav_slug' => 'my-friends',
-            'item_css_id'         => $bp->friends->id
-        );
 
         // Determine user to use
@@ -134 +122 @@
         }
 
-        $friends_link = trailingslashit( $user_domain . bp_get_friends_slug() );
+        $access       = bp_core_can_edit_settings();
+        $slug         = bp_get_friends_slug();
+        $friends_link = trailingslashit( $user_domain . $slug );
+
+        // Add 'Friends' to the main navigation
+        $count    = friends_get_total_friend_count();
+        $class    = ( 0 === $count ) ? 'no-count' : 'count';
+        $main_nav = array(
+            'name'                => sprintf( __( 'Friends <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), bp_core_number_format( $count ) ),
+            'slug'                => $slug,
+            'position'            => 60,
+            'screen_function'     => 'friends_screen_my_friends',
+            'default_subnav_slug' => 'my-friends',
+            'item_css_id'         => $this->id
+        );
 
         // Add the subnav items to the friends nav item
@@ -141 +143 @@
             'slug'            => 'my-friends',
             'parent_url'      => $friends_link,
-            'parent_slug'     => bp_get_friends_slug(),
+            'parent_slug'     => $slug,
             'screen_function' => 'friends_screen_my_friends',
             'position'        => 10,
@@ -151 +153 @@
             'slug'            => 'requests',
             'parent_url'      => $friends_link,
-            'parent_slug'     => bp_get_friends_slug(),
+            'parent_slug'     => $slug,
             'screen_function' => 'friends_screen_requests',
             'position'        => 20,
-            'user_has_access' => bp_core_can_edit_settings()
+            'user_has_access' => $access
         );
 
@@ -171 +173 @@
      */
     public function setup_admin_bar( $wp_admin_nav = array() ) {
-        $bp = buddypress();
 
         // Menus for logged in user
@@ -177 +178 @@
 
             // Setup the logged in user variables
-            $user_domain  = bp_loggedin_user_domain();
-            $friends_link = trailingslashit( $user_domain . $this->slug );
+            $friends_link = trailingslashit( bp_loggedin_user_domain() . bp_get_friends_slug() );
 
             // Pending friend requests
             $count = count( friends_get_friendship_request_user_ids( bp_loggedin_user_id() ) );
             if ( !empty( $count ) ) {
-                $title   = sprintf( _x( 'Friends <span class="count">%s</span>', 'My Account Friends menu', 'buddypress' ), number_format_i18n( $count ) );
-                $pending = sprintf( _x( 'Pending Requests <span class="count">%s</span>', 'My Account Friends menu sub nav', 'buddypress' ), number_format_i18n( $count ) );
+                $title   = sprintf( _x( 'Friends <span class="count">%s</span>',          'My Account Friends menu',         'buddypress' ), bp_core_number_format( $count ) );
+                $pending = sprintf( _x( 'Pending Requests <span class="count">%s</span>', 'My Account Friends menu sub nav', 'buddypress' ), bp_core_number_format( $count ) );
             } else {
-                $title   = _x( 'Friends', 'My Account Friends menu', 'buddypress' );
+                $title   = _x( 'Friends',            'My Account Friends menu',         'buddypress' );
                 $pending = _x( 'No Pending Requests','My Account Friends menu sub nav', 'buddypress' );
             }
@@ -192 +192 @@
             // Add the "My Account" sub menus
             $wp_admin_nav[] = array(
-                'parent' => $bp->my_account_menu_id,
+                'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-' . $this->id,
                 'title'  => $title,
-                'href'   => trailingslashit( $friends_link )
+                'href'   => $friends_link
             );
 
@@ -203 +203 @@
                 'id'     => 'my-account-' . $this->id . '-friendships',
                 'title'  => _x( 'Friendships', 'My Account Friends menu sub nav', 'buddypress' ),
-                'href'   => trailingslashit( $friends_link )
+                'href'   => $friends_link
             );
 
@@ -222 +222 @@
      */
     public function setup_title() {
-        $bp = buddypress();
 
         // Adjust title
         if ( bp_is_friends_component() ) {
+            $bp = buddypress();
+
             if ( bp_is_my_profile() ) {
                 $bp->bp_options_title = __( 'Friendships', 'buddypress' );

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

@@ -121 +121 @@
         );
 
-        if ( is_admin() )
+        if ( is_admin() ) {
             $includes[] = 'admin';
+        }
 
         parent::includes( $includes );
@@ -143 +144 @@
 
         // Define a slug, if necessary
-        if ( !defined( 'BP_GROUPS_SLUG' ) )
+        if ( ! defined( 'BP_GROUPS_SLUG' ) ) {
             define( 'BP_GROUPS_SLUG', $this->id );
+        }
 
         // Global tables for groups component
@@ -214 +216 @@
 
             // Using "item" not "group" for generic support in other components.
-            if ( bp_current_user_can( 'bp_moderate' ) )
+            if ( bp_current_user_can( 'bp_moderate' ) ) {
                 bp_update_is_item_admin( true, 'groups' );
-            else
+            } 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() )
+            if ( ! bp_is_item_admin() ) {
                 bp_update_is_item_mod  ( groups_is_user_mod  ( bp_loggedin_user_id(), $this->current_group->id ), 'groups' );
+            }
 
             // 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 ) {
-                if ( $this->current_group->is_user_member && is_user_logged_in() || bp_current_user_can( 'bp_moderate' ) )
+                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
+                } else {
                     $this->current_group->user_has_access = false;
+                }
             } else {
                 $this->current_group->user_has_access = true;
@@ -346 +353 @@
         }
 
-
         /**
          * Filters the default groups extension.
@@ -357 +363 @@
         $this->default_extension = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'home' );
 
-        if ( !bp_current_action() ) {
-            buddypress()->current_action = $this->default_extension;
+        $bp = buddypress();
+
+        if ( ! bp_current_action() ) {
+            $bp->current_action = $this->default_extension;
         }
 
         // Prepare for a redirect to the canonical URL
-        buddypress()->canonical_stack['base_url'] = bp_get_group_permalink( $this->current_group );
+        $bp->canonical_stack['base_url'] = bp_get_group_permalink( $this->current_group );
 
         if ( bp_current_action() ) {
-            buddypress()->canonical_stack['action'] = bp_current_action();
-        }
-
-        if ( !empty( buddypress()->action_variables ) ) {
-            buddypress()->canonical_stack['action_variables'] = bp_action_variables();
+            $bp->canonical_stack['action'] = bp_current_action();
+        }
+
+        if ( ! empty( $bp->action_variables ) ) {
+            $bp->canonical_stack['action_variables'] = bp_action_variables();
         }
 
@@ -375 +383 @@
         // that extension's slug, unless more has been tacked onto the URL via
         // action variables
-        if ( bp_is_current_action( $this->default_extension ) && empty( buddypress()->action_variables ) )  {
-            unset( buddypress()->canonical_stack['action'] );
+        if ( bp_is_current_action( $this->default_extension ) && empty( $bp->action_variables ) )  {
+            unset( $bp->canonical_stack['action'] );
         }
     }
@@ -391 +399 @@
      */
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-        // Only grab count if we're on a user page
-        if ( bp_is_user() ) {
-            $count    = bp_get_total_group_count_for_user();
-            $class    = ( 0 === $count ) ? 'no-count' : 'count';
-            $nav_name = sprintf( _x( 'Groups <span class="%s">%s</span>', 'Group screen nav with counter', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
-        } else {
-            $nav_name = _x( 'Groups', 'Group screen nav without counter', 'buddypress' );
-        }
-
-        // Add 'Groups' to the main navigation
-        $main_nav = array(
-            'name'                => $nav_name,
-            'slug'                => $this->slug,
-            'position'            => 70,
-            'screen_function'     => 'groups_screen_my_groups',
-            'default_subnav_slug' => 'my-groups',
-            'item_css_id'         => $this->id
-        );
 
         // Determine user to use
@@ -420 +409 @@
         }
 
-        if ( !empty( $user_domain ) ) {
-            $groups_link = trailingslashit( $user_domain . $this->slug );
+        // Only grab count if we're on a user page
+        if ( bp_is_user() ) {
+            $count    = bp_get_total_group_count_for_user();
+            $class    = ( 0 === $count ) ? 'no-count' : 'count';
+            $nav_name = sprintf( _x( 'Groups <span class="%s">%s</span>', 'Group screen nav with counter', 'buddypress' ), esc_attr( $class ), bp_core_number_format( $count ) );
+        } else {
+            $nav_name = _x( 'Groups', 'Group screen nav without counter', 'buddypress' );
+        }
+
+        $slug = bp_get_groups_slug();
+
+        // Add 'Groups' to the main navigation
+        $main_nav = array(
+            'name'                => $nav_name,
+            'slug'                => $slug,
+            'position'            => 70,
+            'screen_function'     => 'groups_screen_my_groups',
+            'default_subnav_slug' => 'my-groups',
+            'item_css_id'         => $this->id
+        );
+
+        if ( ! empty( $user_domain ) ) {
+            $access      = bp_core_can_edit_settings();
+            $groups_link = trailingslashit( $user_domain . $slug );
 
             // Add the My Groups nav item
@@ -428 +439 @@
                 'slug'            => 'my-groups',
                 'parent_url'      => $groups_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'groups_screen_my_groups',
                 'position'        => 10,
@@ -439 +450 @@
                 'slug'            => 'invites',
                 'parent_url'      => $groups_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'groups_screen_group_invites',
-                'user_has_access' => bp_core_can_edit_settings(),
+                'user_has_access' => $access,
                 'position'        => 30
             );
@@ -487 +498 @@
 
                 $sub_nav[] = array(
-                    'name'               => _x( 'Request Membership','Group screen nav', 'buddypress' ),
-                    'slug'               => 'request-membership',
-                    'parent_url'         => $group_link,
-                    'parent_slug'        => $this->current_group->slug,
-                    'screen_function'    => 'groups_screen_group_request_membership',
-                    'position'           => 30
+                    'name'            => _x( 'Request Membership','Group screen nav', 'buddypress' ),
+                    'slug'            => 'request-membership',
+                    'parent_url'      => $group_link,
+                    'parent_slug'     => $this->current_group->slug,
+                    'screen_function' => 'groups_screen_group_request_membership',
+                    'position'        => 30
                 );
             }
@@ -562 +573 @@
 
                 $sub_nav[] = array_merge( array(
-                    'name'            => __( 'Details', 'buddypress' ),
-                    'slug'            => 'edit-details',
-                    'position'        => 0,
+                    'name'     => __( 'Details', 'buddypress' ),
+                    'slug'     => 'edit-details',
+                    'position' => 0,
                 ), $default_params );
 
                 $sub_nav[] = array_merge( array(
-                    'name'            => __( 'Settings', 'buddypress' ),
-                    'slug'            => 'group-settings',
-                    'position'        => 10,
+                    'name'     => __( 'Settings', 'buddypress' ),
+                    'slug'     => 'group-settings',
+                    'position' => 10,
                 ), $default_params );
 
                 if ( ! bp_disable_group_avatar_uploads() && buddypress()->avatar->show_avatars ) {
                     $sub_nav[] = array_merge( array(
-                        'name'        => __( 'Photo', 'buddypress' ),
-                        'slug'        => 'group-avatar',
-                        'position'    => 20,
+                        'name'     => __( 'Photo', 'buddypress' ),
+                        'slug'     => 'group-avatar',
+                        'position' => 20,
                     ), $default_params );
                 }
 
                 $sub_nav[] = array_merge( array(
-                    'name'            => __( 'Members', 'buddypress' ),
-                    'slug'            => 'manage-members',
-                    'position'        => 30,
+                    'name'     => __( 'Members', 'buddypress' ),
+                    'slug'     => 'manage-members',
+                    'position' => 30,
                 ), $default_params );
 
                 if ( 'private' == $this->current_group->status ) {
                     $sub_nav[] = array_merge( array(
-                        'name'            => __( 'Requests', 'buddypress' ),
-                        'slug'            => 'membership-requests',
-                        'position'        => 40,
+                        'name'     => __( 'Requests', 'buddypress' ),
+                        'slug'     => 'membership-requests',
+                        'position' => 40,
                     ), $default_params );
                 }
 
                 $sub_nav[] = array_merge( array(
-                    'name'            => __( 'Delete', 'buddypress' ),
-                    'slug'            => 'delete-group',
-                    'position'        => 1000,
+                    'name'     => __( 'Delete', 'buddypress' ),
+                    'slug'     => 'delete-group',
+                    'position' => 1000,
                 ), $default_params );
             }
@@ -631 +642 @@
      */
     public function setup_admin_bar( $wp_admin_nav = array() ) {
-        $bp = buddypress();
 
         // Menus for logged in user
@@ -637 +647 @@
 
             // Setup the logged in user variables
-            $user_domain = bp_loggedin_user_domain();
-            $groups_link = trailingslashit( $user_domain . $this->slug );
+            $groups_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() );
 
             // Pending group invites
@@ -645 +654 @@
             $pending = _x( 'No Pending Invites', 'My Account Groups sub nav', 'buddypress' );
 
-            if ( !empty( $count['total'] ) ) {
-                $title   = sprintf( _x( 'Groups <span class="count">%s</span>', 'My Account Groups nav', 'buddypress' ), $count );
-                $pending = sprintf( _x( 'Pending Invites <span class="count">%s</span>', 'My Account Groups sub nav', 'buddypress' ), $count );
+            if ( ! empty( $count['total'] ) ) {
+                $title   = sprintf( _x( 'Groups <span class="count">%s</span>',          'My Account Groups nav',     'buddypress' ), bp_core_number_format( $count ) );
+                $pending = sprintf( _x( 'Pending Invites <span class="count">%s</span>', 'My Account Groups sub nav', 'buddypress' ), bp_core_number_format( $count ) );
             }
 
             // Add the "My Account" sub menus
             $wp_admin_nav[] = array(
-                'parent' => $bp->my_account_menu_id,
+                'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-' . $this->id,
                 'title'  => $title,
-                'href'   => trailingslashit( $groups_link )
+                'href'   => $groups_link
             );
 
@@ -663 +672 @@
                 'id'     => 'my-account-' . $this->id . '-memberships',
                 'title'  => _x( 'Memberships', 'My Account Groups sub nav', 'buddypress' ),
-                'href'   => trailingslashit( $groups_link )
+                'href'   => $groups_link
             );
 
@@ -692 +701 @@
      */
     public function setup_title() {
-        $bp = buddypress();
 
         if ( bp_is_groups_component() ) {
+            $bp = buddypress();
 
             if ( bp_is_my_profile() && !bp_is_single_item() ) {

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

@@ -111 +111 @@
     // If xprofile is active, use profile domain link
     if ( ! is_admin() && bp_is_active( 'xprofile' ) ) {
-        $profile_link = trailingslashit( bp_core_get_user_domain( $user_id ) . buddypress()->profile->slug . '/edit' );
+        $profile_link = trailingslashit( bp_core_get_user_domain( $user_id ) . bp_get_profile_slug() . '/edit' );
 
     // Default to $url

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

@@ -142 +142 @@
         /** Profiles Fallback *************************************************/
 
-        if ( !bp_is_active( 'xprofile' ) ) {
+        if ( ! bp_is_active( 'xprofile' ) ) {
             $bp->profile       = new stdClass;
             $bp->profile->slug = 'profile';
@@ -231 +231 @@
         }
 
-        $bp = buddypress();
+        // Determine user to use
+        if ( bp_displayed_user_domain() ) {
+            $user_domain = bp_displayed_user_domain();
+        } elseif ( bp_loggedin_user_domain() ) {
+            $user_domain = bp_loggedin_user_domain();
+        } else {
+            return;
+        }
+
+        $slug         = bp_get_profile_slug();
+        $profile_link = trailingslashit( $user_domain . $slug );
 
         // Setup the main navigation
         $main_nav = array(
             'name'                => _x( 'Profile', 'Member profile main navigation', 'buddypress' ),
-            'slug'                => $bp->profile->slug,
+            'slug'                => $slug,
             'position'            => 20,
             'screen_function'     => 'bp_members_screen_display_profile',
             'default_subnav_slug' => 'public',
-            'item_css_id'         => $bp->profile->id
-        );
-
-        // User links
-        $user_domain  = bp_displayed_user_domain() ? bp_displayed_user_domain() : bp_loggedin_user_domain();
-        $profile_link = trailingslashit( $user_domain . $bp->profile->slug );
+            'item_css_id'         => buddypress()->profile->id
+        );
 
         // Setup the subnav items for the member profile
@@ -252 +258 @@
             'slug'            => 'public',
             'parent_url'      => $profile_link,
-            'parent_slug'     => $bp->profile->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_members_screen_display_profile',
             'position'        => 10

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

@@ -91 +91 @@
 
         // Define a slug, if necessary
-        if ( !defined( 'BP_MESSAGES_SLUG' ) ) {
+        if ( ! defined( 'BP_MESSAGES_SLUG' ) ) {
             define( 'BP_MESSAGES_SLUG', $this->id );
         }
@@ -130 +130 @@
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
-        // Only grab count if we're on a user page and current user has access
-        if ( bp_is_user() && bp_user_has_access() ) {
-            $count    = bp_get_total_unread_messages_count();
-            $class    = ( 0 === $count ) ? 'no-count' : 'count';
-            $nav_name = sprintf( __( 'Messages <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
-        } else {
-            $nav_name = __( 'Messages', 'buddypress' );
-        }
-
-        // Add 'Messages' to the main navigation
-        $main_nav = array(
-            'name'                    => $nav_name,
-            'slug'                    => $this->slug,
-            'position'                => 50,
-            'show_for_displayed_user' => bp_core_can_edit_settings(),
-            'screen_function'         => 'messages_screen_inbox',
-            'default_subnav_slug'     => 'inbox',
-            'item_css_id'             => $this->id
-        );
-
         // Determine user to use
         if ( bp_displayed_user_domain() ) {
@@ -159 +139 @@
         }
 
-        // Link to user messages
-        $messages_link = trailingslashit( $user_domain . $this->slug );
+        $access        = bp_core_can_edit_settings();
+        $slug          = bp_get_messages_slug();
+        $messages_link = trailingslashit( $user_domain . $slug );
+
+        // Only grab count if we're on a user page and current user has access
+        if ( bp_is_user() && bp_user_has_access() ) {
+            $count    = bp_get_total_unread_messages_count();
+            $class    = ( 0 === $count ) ? 'no-count' : 'count';
+            $nav_name = sprintf( __( 'Messages <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), bp_core_number_format( $count ) );
+        } else {
+            $nav_name = __( 'Messages', 'buddypress' );
+        }
+
+        // Add 'Messages' to the main navigation
+        $main_nav = array(
+            'name'                    => $nav_name,
+            'slug'                    => $slug,
+            'position'                => 50,
+            'show_for_displayed_user' => $access,
+            'screen_function'         => 'messages_screen_inbox',
+            'default_subnav_slug'     => 'inbox',
+            'item_css_id'             => $this->id
+        );
 
         // Add the subnav items to the profile
@@ -167 +168 @@
             'slug'            => 'inbox',
             'parent_url'      => $messages_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'messages_screen_inbox',
             'position'        => 10,
-            'user_has_access' => bp_core_can_edit_settings()
+            'user_has_access' => $access
         );
 
@@ -178 +179 @@
                 'slug'            => bp_get_messages_starred_slug(),
                 'parent_url'      => $messages_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'bp_messages_star_screen',
                 'position'        => 11,
-                'user_has_access' => bp_core_can_edit_settings()
+                'user_has_access' => $access
             );
         }
@@ -189 +190 @@
             'slug'            => 'sentbox',
             'parent_url'      => $messages_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'messages_screen_sentbox',
             'position'        => 20,
-            'user_has_access' => bp_core_can_edit_settings()
+            'user_has_access' => $access
         );
 
@@ -199 +200 @@
             'slug'            => 'compose',
             'parent_url'      => $messages_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'messages_screen_compose',
             'position'        => 30,
-            'user_has_access' => bp_core_can_edit_settings()
+            'user_has_access' => $access
         );
 
@@ -210 +211 @@
                 'slug'            => 'notices',
                 'parent_url'      => $messages_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'messages_screen_notices',
                 'position'        => 90,
-                'user_has_access' => bp_current_user_can( 'bp_moderate' )
+                'user_has_access' => true
             );
         }
@@ -227 +228 @@
      */
     public function setup_admin_bar( $wp_admin_nav = array() ) {
-        $bp = buddypress();
 
         // Menus for logged in user
@@ -233 +233 @@
 
             // Setup the logged in user variables
-            $user_domain   = bp_loggedin_user_domain();
-            $messages_link = trailingslashit( $user_domain . $this->slug );
+            $messages_link = trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() );
 
             // Unread message count
             $count = messages_get_unread_count();
             if ( !empty( $count ) ) {
-                $title = sprintf( __( 'Messages <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );
-                $inbox = sprintf( __( 'Inbox <span class="count">%s</span>',    'buddypress' ), number_format_i18n( $count ) );
+                $title = sprintf( __( 'Messages <span class="count">%s</span>', 'buddypress' ), bp_core_number_format( $count ) );
+                $inbox = sprintf( __( 'Inbox <span class="count">%s</span>',    'buddypress' ), bp_core_number_format( $count ) );
             } else {
                 $title = __( 'Messages', 'buddypress' );
@@ -248 +247 @@
             // Add main Messages menu
             $wp_admin_nav[] = array(
-                'parent' => $bp->my_account_menu_id,
+                'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-' . $this->id,
                 'title'  => $title,
-                'href'   => trailingslashit( $messages_link )
+                'href'   => $messages_link
             );
 
@@ -259 +258 @@
                 'id'     => 'my-account-' . $this->id . '-inbox',
                 'title'  => $inbox,
-                'href'   => trailingslashit( $messages_link . 'inbox' )
+                'href'   => $messages_link
             );
 
@@ -306 +305 @@
      */
     public function setup_title() {
-        $bp = buddypress();
 
         if ( bp_is_messages_component() ) {
+            $bp = buddypress();
+
             if ( bp_is_my_profile() ) {
                 $bp->bp_options_title = __( 'My Messages', 'buddypress' );

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

@@ -68 +68 @@
 
         // Define a slug, if necessary
-        if ( !defined( 'BP_NOTIFICATIONS_SLUG' ) ) {
+        if ( ! defined( 'BP_NOTIFICATIONS_SLUG' ) ) {
             define( 'BP_NOTIFICATIONS_SLUG', $this->id );
         }
@@ -104 +104 @@
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
-        // Only grab count if we're on a user page and current user has access
-        if ( bp_is_user() && bp_user_has_access() ) {
-            $count    = bp_notifications_get_unread_notification_count( bp_displayed_user_id() );
-            $class    = ( 0 === $count ) ? 'no-count' : 'count';
-            $nav_name = sprintf( _x( 'Notifications <span class="%s">%s</span>', 'Profile screen nav', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
-        } else {
-            $nav_name = _x( 'Notifications', 'Profile screen nav', 'buddypress' );
-        }
-
-        // Add 'Notifications' to the main navigation
-        $main_nav = array(
-            'name'                    => $nav_name,
-            'slug'                    => $this->slug,
-            'position'                => 30,
-            'show_for_displayed_user' => bp_core_can_edit_settings(),
-            'screen_function'         => 'bp_notifications_screen_unread',
-            'default_subnav_slug'     => 'unread',
-            'item_css_id'             => $this->id,
-        );
-
         // Determine user to use
         if ( bp_displayed_user_domain() ) {
@@ -133 +113 @@
         }
 
-        $notifications_link = trailingslashit( $user_domain . bp_get_notifications_slug() );
+        $access             = bp_core_can_edit_settings();
+        $slug               = bp_get_notifications_slug();
+        $notifications_link = trailingslashit( $user_domain . $slug );
+
+        // Only grab count if we're on a user page and current user has access
+        if ( bp_is_user() && bp_user_has_access() ) {
+            $count    = bp_notifications_get_unread_notification_count( bp_displayed_user_id() );
+            $class    = ( 0 === $count ) ? 'no-count' : 'count';
+            $nav_name = sprintf( _x( 'Notifications <span class="%s">%s</span>', 'Profile screen nav', 'buddypress' ), esc_attr( $class ), bp_core_number_format( $count ) );
+        } else {
+            $nav_name = _x( 'Notifications', 'Profile screen nav', 'buddypress' );
+        }
+
+        // Add 'Notifications' to the main navigation
+        $main_nav = array(
+            'name'                    => $nav_name,
+            'slug'                    => $slug,
+            'position'                => 30,
+            'show_for_displayed_user' => $access,
+            'screen_function'         => 'bp_notifications_screen_unread',
+            'default_subnav_slug'     => 'unread',
+            'item_css_id'             => $this->id,
+        );
 
         // Add the subnav items to the notifications nav item
@@ -140 +142 @@
             'slug'            => 'unread',
             'parent_url'      => $notifications_link,
-            'parent_slug'     => bp_get_notifications_slug(),
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_notifications_screen_unread',
             'position'        => 10,
             'item_css_id'     => 'notifications-my-notifications',
-            'user_has_access' => bp_core_can_edit_settings(),
+            'user_has_access' => $access,
         );
 
@@ -151 +153 @@
             'slug'            => 'read',
             'parent_url'      => $notifications_link,
-            'parent_slug'     => bp_get_notifications_slug(),
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_notifications_screen_read',
             'position'        => 20,
-            'user_has_access' => bp_core_can_edit_settings(),
+            'user_has_access' => $access,
         );
 
@@ -177 +179 @@
 
             // Setup the logged in user variables
-            $notifications_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
+            $notifications_link = trailingslashit( bp_loggedin_user_domain() . bp_get_notifications_slug() );
 
             // Pending notification requests
             $count = bp_notifications_get_unread_notification_count( bp_loggedin_user_id() );
             if ( ! empty( $count ) ) {
-                $title  = sprintf( _x( 'Notifications <span class="count">%s</span>', 'My Account Notification pending', 'buddypress' ), number_format_i18n( $count ) );
-                $unread = sprintf( _x( 'Unread <span class="count">%s</span>', 'My Account Notification pending', 'buddypress' ), number_format_i18n( $count ) );
+                $title  = sprintf( _x( 'Notifications <span class="count">%s</span>', 'My Account Notification pending', 'buddypress' ), bp_core_number_format( $count ) );
+                $unread = sprintf( _x( 'Unread <span class="count">%s</span>',        'My Account Notification pending', 'buddypress' ), bp_core_number_format( $count ) );
             } else {
-                $title  = _x( 'Notifications', 'My Account Notification', 'buddypress' );
-                $unread = _x( 'Unread', 'My Account Notification sub nav', 'buddypress' );
+                $title  = _x( 'Notifications', 'My Account Notification',         'buddypress' );
+                $unread = _x( 'Unread',        'My Account Notification sub nav', 'buddypress' );
             }
 
@@ -194 +196 @@
                 'id'     => 'my-account-' . $this->id,
                 'title'  => $title,
-                'href'   => trailingslashit( $notifications_link ),
+                'href'   => $notifications_link
             );
 
@@ -202 +204 @@
                 'id'     => 'my-account-' . $this->id . '-unread',
                 'title'  => $unread,
-                'href'   => trailingslashit( $notifications_link ),
+                'href'   => $notifications_link
             );
 
@@ -223 +225 @@
      */
     public function setup_title() {
-        $bp = buddypress();
 
         // Adjust title
         if ( bp_is_notifications_component() ) {
+            $bp = buddypress();
+
             if ( bp_is_my_profile() ) {
                 $bp->bp_options_title = __( 'Notifications', 'buddypress' );

trunk/src/bp-settings/bp-settings-loader.php

@@ -31 +31 @@
     /**
      * Include files
-     *
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     public function includes( $includes = array() ) {
@@ -54 +52 @@
 
         // Define a slug, if necessary
-        if ( !defined( 'BP_SETTINGS_SLUG' ) )
+        if ( ! defined( 'BP_SETTINGS_SLUG' ) ) {
             define( 'BP_SETTINGS_SLUG', $this->id );
+        }
 
         // All globals for settings component.
@@ -68 +67 @@
      */
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-        // Add the settings navigation item
-        $main_nav = array(
-            'name'                    => __( 'Settings', 'buddypress' ),
-            'slug'                    => $this->slug,
-            'position'                => 100,
-            'show_for_displayed_user' => bp_core_can_edit_settings(),
-            'screen_function'         => 'bp_settings_screen_general',
-            'default_subnav_slug'     => 'general'
-        );
 
         // Determine user to use
@@ -88 +77 @@
         }
 
-        $settings_link = trailingslashit( $user_domain . $this->slug );
+        $access        = bp_core_can_edit_settings();
+        $slug          = bp_get_settings_slug();
+        $settings_link = trailingslashit( $user_domain . $slug );
+
+        // Add the settings navigation item
+        $main_nav = array(
+            'name'                    => __( 'Settings', 'buddypress' ),
+            'slug'                    => $slug,
+            'position'                => 100,
+            'show_for_displayed_user' => $access,
+            'screen_function'         => 'bp_settings_screen_general',
+            'default_subnav_slug'     => 'general'
+        );
 
         // Add General Settings nav item
@@ -95 +96 @@
             'slug'            => 'general',
             'parent_url'      => $settings_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_settings_screen_general',
             'position'        => 10,
-            'user_has_access' => bp_core_can_edit_settings()
+            'user_has_access' => $access
         );
 
@@ -107 +108 @@
             'slug'            => 'notifications',
             'parent_url'      => $settings_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_settings_screen_notification',
             'position'        => 20,
-            'user_has_access' => bp_core_can_edit_settings()
+            'user_has_access' => $access
         );
 
@@ -119 +120 @@
                 'slug'            => 'capabilities',
                 'parent_url'      => $settings_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'bp_settings_screen_capabilities',
                 'position'        => 80,
@@ -132 +133 @@
                 'slug'            => 'delete-account',
                 'parent_url'      => $settings_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'bp_settings_screen_delete_account',
                 'position'        => 90,
@@ -147 +148 @@
     public function setup_admin_bar( $wp_admin_nav = array() ) {
 
-        // The instance
-        $bp = buddypress();
-
         // Menus for logged in user
         if ( is_user_logged_in() ) {
 
             // Setup the logged in user variables
-            $user_domain   = bp_loggedin_user_domain();
-            $settings_link = trailingslashit( $user_domain . $this->slug );
+            $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
 
             // Add main Settings menu
             $wp_admin_nav[] = array(
-                'parent' => $bp->my_account_menu_id,
+                'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-' . $this->id,
                 'title'  => __( 'Settings', 'buddypress' ),
-                'href'   => trailingslashit( $settings_link )
+                'href'   => $settings_link
             );
 
@@ -170 +167 @@
                 'id'     => 'my-account-' . $this->id . '-general',
                 'title'  => __( 'General', 'buddypress' ),
-                'href'   => trailingslashit( $settings_link . 'general' )
+                'href'   => $settings_link
             );
 

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

@@ -96 +96 @@
     // your language doesn't have this restriction, feel free to use a more
     // natural translation.
-    $profile_link = trailingslashit( bp_core_get_user_domain( $activity->user_id ) . buddypress()->profile->slug );
+    $profile_link = trailingslashit( bp_core_get_user_domain( $activity->user_id ) . bp_get_profile_slug() );
     $action       = sprintf( __( '%s&#8217;s profile was updated', 'buddypress' ), '<a href="' . $profile_link . '">' . bp_core_get_user_displayname( $activity->user_id ) . '</a>' );
 
@@ -318 +318 @@
 
     // If we've reached this point, assemble and post the activity item
-    $profile_link = trailingslashit( bp_core_get_user_domain( $user_id ) . buddypress()->profile->slug );
+    $profile_link = trailingslashit( bp_core_get_user_domain( $user_id ) . bp_get_profile_slug() );
 
     return (bool) xprofile_record_activity( array(

trunk/src/bp-xprofile/bp-xprofile-loader.php

@@ -172 +172 @@
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
-        $sub_nav = array();
+        // Determine user to use
+        if ( bp_displayed_user_domain() ) {
+            $user_domain = bp_displayed_user_domain();
+        } elseif ( bp_loggedin_user_domain() ) {
+            $user_domain = bp_loggedin_user_domain();
+        } else {
+            return;
+        }
+
+        $slug         = 
+        $profile_link = trailingslashit( $user_domain . $this->slug );
 
         // Add 'Profile' to the main navigation
@@ -183 +193 @@
             'item_css_id'         => $this->id
         );
-
-        // Determine user to use
-        if ( bp_displayed_user_domain() ) {
-            $user_domain = bp_displayed_user_domain();
-        } elseif ( bp_loggedin_user_domain() ) {
-            $user_domain = bp_loggedin_user_domain();
-        } else {
-            return;
-        }
-
-        $profile_link = trailingslashit( $user_domain . $this->slug );
 
         // Add the subnav items to the profile
@@ -276 +275 @@
      */
     public function setup_admin_bar( $wp_admin_nav = array() ) {
-        $bp = buddypress();
-
-        // Prevent debug notices
-        $wp_admin_nav = array();
 
         // Menus for logged in user
@@ -285 +280 @@
 
             // Profile link
-            $profile_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
+            $profile_link = trailingslashit( bp_loggedin_user_domain() . bp_get_profile_slug() );
 
             // Add the "Profile" sub menu
             $wp_admin_nav[] = array(
-                'parent' => $bp->my_account_menu_id,
+                'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-' . $this->id,
                 'title'  => _x( 'Profile', 'My Account Profile', 'buddypress' ),
-                'href'   => trailingslashit( $profile_link )
+                'href'   => $profile_link
             );
 
@@ -300 +295 @@
                 'id'     => 'my-account-' . $this->id . '-public',
                 'title'  => _x( 'View', 'My Account Profile sub nav', 'buddypress' ),
-                'href'   => trailingslashit( $profile_link . 'public' )
+                'href'   => $profile_link
             );
 
@@ -339 +334 @@
      */
     public function setup_title() {
-        $bp = buddypress();
 
         if ( bp_is_profile_component() ) {
+            $bp = buddypress();
+
             if ( bp_is_my_profile() ) {
                 $bp->bp_options_title = _x( 'My Profile', 'Page title', 'buddypress' );
@@ -384 +380 @@
      */
     public function setup_settings_admin_nav( $wp_admin_nav ) {
+
         // Setup the logged in user variables
         $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );

trunk/src/bp-xprofile/bp-xprofile-screens.php

@@ -53 +53 @@
 function xprofile_screen_edit_profile() {
 
-    if ( !bp_is_my_profile() && !bp_current_user_can( 'bp_moderate' ) )
+    if ( ! bp_is_my_profile() && ! bp_current_user_can( 'bp_moderate' ) ) {
         return false;
-
-    $bp = buddypress();
+    }
 
     // Make sure a group is set.
-    if ( !bp_action_variable( 1 ) )
-        bp_core_redirect( trailingslashit( bp_displayed_user_domain() . $bp->profile->slug . '/edit/group/1' ) );
+    if ( ! bp_action_variable( 1 ) ) {
+        bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_profile_slug() . '/edit/group/1' ) );
+    }
 
     // Check the field group exists
-    if ( !bp_is_action_variable( 'group' ) || !xprofile_get_field_group( bp_action_variable( 1 ) ) ) {
+    if ( ! bp_is_action_variable( 'group' ) || ! xprofile_get_field_group( bp_action_variable( 1 ) ) ) {
         bp_do_404();
         return;
@@ -78 +78 @@
 
         // Check we have field ID's
-        if ( empty( $_POST['field_ids'] ) )
-            bp_core_redirect( trailingslashit( bp_displayed_user_domain() . $bp->profile->slug . '/edit/group/' . bp_action_variable( 1 ) ) );
+        if ( empty( $_POST['field_ids'] ) ) {
+            bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_profile_slug() . '/edit/group/' . bp_action_variable( 1 ) ) );
+        }
 
         // Explode the posted field IDs into an array so we know which
@@ -181 +182 @@
 
             // Redirect back to the edit screen to display the updates and message
-            bp_core_redirect( trailingslashit( bp_displayed_user_domain() . $bp->profile->slug . '/edit/group/' . bp_action_variable( 1 ) ) );
+            bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_profile_slug() . '/edit/group/' . bp_action_variable( 1 ) ) );
         }
     }
@@ -212 +213 @@
 
     // Bail if not the correct screen
-    if ( !bp_is_my_profile() && !bp_current_user_can( 'bp_moderate' ) )
+    if ( ! bp_is_my_profile() && ! bp_current_user_can( 'bp_moderate' ) ) {
         return false;
+    }
 
     // Bail if there are action variables
@@ -223 +225 @@
     $bp = buddypress();
 
-    if ( ! isset( $bp->avatar_admin ) )
+    if ( ! isset( $bp->avatar_admin ) ) {
         $bp->avatar_admin = new stdClass();
+    }
 
     $bp->avatar_admin->step = 'upload-image';

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

@@ -522 +522 @@
          *                      profile group edit form.
          */
-        return apply_filters( 'bp_get_the_profile_group_edit_form_action', trailingslashit( bp_displayed_user_domain() . $bp->profile->slug . '/edit/group/' . $group->id ) );
+        return apply_filters( 'bp_get_the_profile_group_edit_form_action', trailingslashit( bp_displayed_user_domain() . bp_get_profile_slug() . '/edit/group/' . $group->id ) );
     }
 
@@ -1029 +1029 @@
 
         // Build the profile field group link
-        $link   = trailingslashit( bp_displayed_user_domain() . buddypress()->profile->slug . '/edit/group/' . $groups[ $i ]->id );
+        $link   = trailingslashit( bp_displayed_user_domain() . bp_get_profile_slug() . '/edit/group/' . $groups[ $i ]->id );
 
         // Add tab to end of tabs array
@@ -1136 +1136 @@
 }
     function bp_get_avatar_delete_link() {
-        $bp = buddypress();
 
         /**
@@ -1145 +1144 @@
          * @param string $value Nonced URL used for deleting an avatar.
          */
-        return apply_filters( 'bp_get_avatar_delete_link', wp_nonce_url( bp_displayed_user_domain() . $bp->profile->slug . '/change-avatar/delete-avatar/', 'bp_delete_avatar_link' ) );
+        return apply_filters( 'bp_get_avatar_delete_link', wp_nonce_url( bp_displayed_user_domain() . bp_get_profile_slug() . '/change-avatar/delete-avatar/', 'bp_delete_avatar_link' ) );
     }
 
 function bp_edit_profile_button() {
-    $bp = buddypress();
-
     bp_button( array(
         'id'                => 'edit_profile',
@@ -1156 +1153 @@
         'must_be_logged_in' => true,
         'block_self'        => true,
-        'link_href'         => trailingslashit( bp_displayed_user_domain() . $bp->profile->slug . '/edit' ),
+        'link_href'         => trailingslashit( bp_displayed_user_domain() . bp_get_profile_slug() . '/edit' ),
         'link_class'        => 'edit',
         'link_text'         => __( 'Edit Profile', 'buddypress' ),

trunk/tests/phpunit/testcases/routing/xprofile.php

@@ -20 +20 @@
 
     function test_member_profile() {
-        $this->go_to( bp_core_get_user_domain( bp_loggedin_user_id() ) . buddypress()->profile->slug );
+        $this->go_to( bp_core_get_user_domain( bp_loggedin_user_id() ) . bp_get_profile_slug() );
         $this->assertTrue( bp_is_user_profile() );
     }
 
     function test_member_profile_edit() {
-        $this->go_to( bp_core_get_user_domain( bp_loggedin_user_id() ) . buddypress()->profile->slug . '/edit' );
+        $this->go_to( bp_core_get_user_domain( bp_loggedin_user_id() ) . bp_get_profile_slug() . '/edit' );
         $this->assertTrue( bp_is_user_profile_edit() );
     }
 
     function test_member_profile_change_avatar() {
-        $this->go_to( bp_core_get_user_domain( bp_loggedin_user_id() ) . buddypress()->profile->slug . '/change-avatar' );
+        $this->go_to( bp_core_get_user_domain( bp_loggedin_user_id() ) . bp_get_profile_slug() . '/change-avatar' );
         $this->assertTrue( bp_is_user_change_avatar() );
     }

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

@@ -304 +304 @@
         ) );
 
-        $expected = sprintf( __( '%s&#8217;s profile was updated', 'buddypress' ), '<a href="' . bp_core_get_user_domain( $u ) . buddypress()->profile->slug . '/">' . bp_core_get_user_displayname( $u ) . '</a>' );
+        $expected = sprintf( __( '%s&#8217;s profile was updated', 'buddypress' ), '<a href="' . bp_core_get_user_domain( $u ) . bp_get_profile_slug() . '/">' . bp_core_get_user_displayname( $u ) . '</a>' );
 
         $a_obj = new BP_Activity_Activity( $a );