Changeset 1718

Timestamp:

08/27/2009 09:18:10 PM (15 years ago)

Author:

apeatling

Message:

Fixes #723

Location:

trunk

Files:

• bp-activity.php (modified) (2 diffs)
• bp-blogs.php (modified) (2 diffs)
• bp-core.php (modified) (4 diffs)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/bp-core-settings.php (modified) (3 diffs)
• bp-core/bp-core-templatetags.php (modified) (2 diffs)
• bp-core/deprecated/bp-core-deprecated.php (modified) (1 diff)
• bp-forums.php (modified) (2 diffs)
• bp-friends.php (modified) (2 diffs)
• bp-groups.php (modified) (3 diffs)
• bp-groups/bp-groups-classes.php (modified) (7 diffs)
• bp-messages.php (modified) (2 diffs)
• bp-status.php (modified) (1 diff)
• bp-wire.php (modified) (2 diffs)
• bp-wire/bp-wire-templatetags.php (modified) (4 diffs)
• bp-xprofile.php (modified) (2 diffs)

trunk/bp-activity.php

@@ -60 +60 @@
     $bp->activity->table_name = $wpdb->base_prefix . 'bp_activity_user_activity_cached';
     $bp->activity->slug = BP_ACTIVITY_SLUG;
+    
+    /* Register this in the active components array */
+    $bp->active_components[$bp->activity->slug] = $bp->activity->id;
 }
 add_action( 'plugins_loaded', 'bp_activity_setup_globals', 5 );
@@ -82 +85 @@
 
     /* Add 'Activity' to the main navigation */
-    bp_core_new_nav_item( array( 'name' => __( 'Activity', 'buddypress' ), 'slug' => $bp->activity->slug, 'position' => 10, 'screen_function' => 'bp_activity_screen_my_activity', 'default_subnav_slug' => 'just-me' ) );
+    bp_core_new_nav_item( array( 'name' => __( 'Activity', 'buddypress' ), 'slug' => $bp->activity->slug, 'position' => 10, 'screen_function' => 'bp_activity_screen_my_activity', 'default_subnav_slug' => 'just-me', 'item_css_id' => $bp->activity->id ) );
 
     $activity_link = $bp->loggedin_user->domain . $bp->activity->slug . '/';

trunk/bp-blogs.php

@@ -117 +117 @@
     $bp->blogs->format_notification_function = 'bp_blogs_format_notifications';
     $bp->blogs->slug = BP_BLOGS_SLUG;
+
+    /* Register this in the active components array */
+    $bp->active_components[$bp->blogs->slug] = $bp->blogs->id;
 }
 add_action( 'plugins_loaded', 'bp_blogs_setup_globals', 5 );    
@@ -140 +143 @@
     
     /* Add 'Blogs' to the main navigation */
-    bp_core_new_nav_item( array( 'name' => __( 'Blogs', 'buddypress' ), 'slug' => $bp->blogs->slug, 'position' => 30, 'screen_function' => 'bp_blogs_screen_my_blogs', 'default_subnav_slug' => 'my-blogs' ) );
+    bp_core_new_nav_item( array( 'name' => __( 'Blogs', 'buddypress' ), 'slug' => $bp->blogs->slug, 'position' => 30, 'screen_function' => 'bp_blogs_screen_my_blogs', 'default_subnav_slug' => 'my-blogs', 'item_css_id' => $bp->blogs->id ) );
     
     $blogs_link = $bp->loggedin_user->domain . $bp->blogs->slug . '/';

trunk/bp-core.php

@@ -136 +136 @@
     /* Sets up container used for the avatar of the current component being viewed. Rendered by bp_get_options_avatar() */
     $bp->bp_options_avatar = '';
+    
+    /* Contains an array of all the active components. The key is the slug, value the internal ID of the component */
+    $bp->active_components = array();
     
     /* Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar */
@@ -553 +556 @@
         'parent_url' => false, // URL of the parent item
         'item_css_id' => false, // The CSS ID to apply to the HTML of the nav item
-        'user_has_access' => true, // Can the user see this nav item?
+        'user_has_access' => true, // Can the logged in user see this nav item?
         'site_admin_only' => false, // Can only site admins see this nav item?
-        'position' => 90, // Index of where should this nav item be positioned
+        'position' => 90, // Index of where this nav item should be positioned
         'screen_function' => false // The name of the function to run when clicked
     );
@@ -579 +582 @@
         'css_id' => $item_css_id,
         'position' => $position
-    );   
+    );
         
     if ( $bp->current_action == $slug && $bp->current_component == $parent_slug && $user_has_access ) {
@@ -649 +652 @@
 
 /**
- * bp_core_add_nav_default()
- *
- * Set a default action for a nav item, when a sub nav item has not yet been selected.
- * 
- * @package BuddyPress Core
- * @param $parent_id The id of the parent navigation item.
- * @param $function The function to run when this sub nav item is selected.
- * @param $slug The slug of the sub nav item to highlight.
- * @uses is_site_admin() returns true if the current user is a site admin, false if not
- * @uses bp_is_home() Returns true if the current user being viewed is equal the logged in user
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- */
-function bp_core_add_nav_default( $parent_id, $function, $slug = false, $user_has_access = true, $admin_only = false ) {
-    global $bp;
-    
-    if ( !$user_has_access && !bp_is_home() )
-        return false;
-        
-    if ( $admin_only && !is_site_admin() )
-        return false;
-
-    if ( $bp->current_component == $parent_id && !$bp->current_action ) {
-        if ( function_exists($function) ) {
-            add_action( 'wp', $function, 3 );
-        }
-        
-        if ( $slug )
-            $bp->current_action = $slug;
-    }
-}
-
-/**
  * bp_core_load_template()
  *

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

@@ -115 +115 @@
             unset($bp_uri[2]);
         }
-        
+
         /* Reset the keys by merging with an empty array */
         $bp_uri = array_merge( array(), $bp_uri );
+
     }
 

trunk/bp-core/bp-core-settings.php

@@ -1 +1 @@
 <?php
+
+if ( !defined( 'BP_SETTINGS_SLUG' ) )
+    define( 'BP_SETTINGS_SLUG', 'settings' );
+    
 function bp_core_add_settings_nav() {
     global $bp;
+    
+    /* Set up settings as a sudo-component for identification and nav selection */
+    $bp->settings->id = 'settings';
+    $bp->settings->slug = BP_SETTINGS_SLUG;
+    
+    /* Register this in the active components array */
+    $bp->active_components[$bp->settings->slug] = $bp->settings->id;
 
     /* Add the settings navigation item */
-    bp_core_new_nav_item( array( 'name' => __('Settings', 'buddypress'), 'slug' => 'settings', 'position' => 100, 'show_for_displayed_user' => false, 'screen_function' => 'bp_core_screen_general_settings', 'default_subnav_slug' => 'general' ) );
+    bp_core_new_nav_item( array( 'name' => __('Settings', 'buddypress'), 'slug' => $bp->settings->slug, 'position' => 100, 'show_for_displayed_user' => false, 'screen_function' => 'bp_core_screen_general_settings', 'default_subnav_slug' => 'general' ) );
 
     $settings_link = $bp->loggedin_user->domain . 'settings/';
     
-    bp_core_new_subnav_item( array( 'name' => __( 'General', 'buddypress' ), 'slug' => 'general', 'parent_url' => $settings_link, 'parent_slug' => 'settings', 'screen_function' => 'bp_core_screen_general_settings', 'position' => 10, 'user_has_access' => bp_is_home() ) );
-    bp_core_new_subnav_item( array( 'name' => __( 'Notifications', 'buddypress' ), 'slug' => 'notifications', 'parent_url' => $settings_link, 'parent_slug' => 'settings', 'screen_function' => 'bp_core_screen_notification_settings', 'position' => 20, 'user_has_access' => bp_is_home() ) );
+    bp_core_new_subnav_item( array( 'name' => __( 'General', 'buddypress' ), 'slug' => 'general', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_general_settings', 'position' => 10, 'user_has_access' => bp_is_home() ) );
+    bp_core_new_subnav_item( array( 'name' => __( 'Notifications', 'buddypress' ), 'slug' => 'notifications', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_notification_settings', 'position' => 20, 'user_has_access' => bp_is_home() ) );
     
     if ( !is_site_admin() )
-        bp_core_new_subnav_item( array( 'name' => __( 'Delete Account', 'buddypress' ), 'slug' => 'delete-account', 'parent_url' => $settings_link, 'parent_slug' => 'settings', 'screen_function' => 'bp_core_screen_delete_account', 'position' => 90, 'user_has_access' => bp_is_home() ) );
+        bp_core_new_subnav_item( array( 'name' => __( 'Delete Account', 'buddypress' ), 'slug' => 'delete-account', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_delete_account', 'position' => 90, 'user_has_access' => bp_is_home() ) );
 }
 add_action( 'wp', 'bp_core_add_settings_nav', 2 );
@@ -21 +32 @@
 function bp_core_screen_general_settings() {
     global $current_user, $bp_settings_updated, $pass_error;
+    
+    $bp_settings_updated = false;
+    $pass_error = false;
+    
+    if ( isset($_POST['submit']) && check_admin_referer('bp_settings_general') ) {
+        require_once( WPINC . '/registration.php' );
+        
+        // Form has been submitted and nonce checks out, lets do it.
+        
+        if ( $_POST['email'] != '' )
+            $current_user->user_email = wp_specialchars( trim( $_POST['email'] ) );
+
+        if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
+            if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) )
+                $current_user->user_pass = $_POST['pass1'];
+            else
+                $pass_error = true;
+        } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
+            $pass_error = true;
+        } else {
+            unset( $current_user->user_pass );
+        }
+        
+        if ( !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
+            $bp_settings_updated = true;
+    }
+    
+    add_action( 'bp_template_title', 'bp_core_screen_general_settings_title' );
+    add_action( 'bp_template_content', 'bp_core_screen_general_settings_content' );
+    
+    bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
+}
+
+function bp_core_screen_general_settings_title() {
+    _e( 'General Settings', 'buddypress' );
+}
+
+function bp_core_screen_general_settings_content() {
+    global $bp, $current_user, $bp_settings_updated, $pass_error; ?>
+
+    <?php if ( $bp_settings_updated && !$pass_error ) { ?>
+        <div id="message" class="updated fade">
+            <p><?php _e( 'Changes Saved.', 'buddypress' ) ?></p>
+        </div>
+    <?php } ?>
+    
+    <?php if ( $pass_error && !$bp_settings_updated ) { ?>
+        <div id="message" class="error fade">
+            <p><?php _e( 'Your passwords did not match', 'buddypress' ) ?></p>
+        </div>  
+    <?php } ?>
+
+    <form action="<?php echo $bp->loggedin_user->domain . 'settings/general' ?>" method="post" class="standard-form" id="settings-form">
+        <label for="email"><?php _e( 'Account Email', 'buddypress' ) ?></label>
+        <input type="text" name="email" id="email" value="<?php echo attribute_escape( $current_user->user_email ); ?>" class="settings-input" />
+            
+        <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ) ?></label>
+        <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ) ?>
+        <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ) ?>
+    
+        <p class="submit"><input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
+        <?php wp_nonce_field('bp_settings_general') ?>
+    </form>
+<?php
+}
+
+/***** NOTIFICATION SETTINGS ******/
+
+function bp_core_screen_notification_settings() {
+    global $current_user, $bp_settings_updated;
+    
+    $bp_settings_updated = false;
+    
+    if ( $_POST['submit'] && check_admin_referer('bp_settings_notifications') ) {
+        if ( $_POST['notifications'] ) {
+            foreach ( $_POST['notifications'] as $key => $value ) {
+                update_usermeta( (int)$current_user->id, $key, $value );
+            }
+        }
+        
+        $bp_settings_updated = true;
+    }
+        
+    add_action( 'bp_template_title', 'bp_core_screen_notification_settings_title' );
+    add_action( 'bp_template_content', 'bp_core_screen_notification_settings_content' );
+    
+    bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
+}
+
+function bp_core_screen_notification_settings_title() {
+    _e( 'Notification Settings', 'buddypress' );
+}
+
+function bp_core_screen_notification_settings_content() {
+    global $bp, $current_user, $bp_settings_updated; ?>
+
+    <?php if ( $bp_settings_updated ) { ?>
+        <div id="message" class="updated fade">
+            <p><?php _e( 'Changes Saved.', 'buddypress' ) ?></p>
+        </div>
+    <?php } ?>
+    
+    <form action="<?php echo $bp->loggedin_user->domain . 'settings/notifications' ?>" method="post" id="settings-form">
+        <h3><?php _e( 'Email Notifications', 'buddypress' ) ?></h3>
+        <p><?php _e( 'Send a notification by email when:', 'buddypress' ) ?></p>
+        
+        <?php do_action( 'bp_notification_settings' ) ?>
+        
+        <p class="submit"><input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>     
+        
+        <?php wp_nonce_field('bp_settings_notifications') ?>
+        
+    </form>
+<?php
+}
+
+/**** DELETE ACCOUNT ****/
+
+function bp_core_screen_delete_account() {
+    global $current_user, $bp_settings_updated, $pass_error;
+    
+    if ( isset( $_POST['delete-account-button'] ) && check_admin_referer('delete-account') ) {
+        if ( !check_admin_referer( 'delete-account' ) )
+            return false;
+        
+        // delete the users account
+        if ( bp_core_delete_account() )
+            bp_core_redirect( site_url() );
+    }
     
     $bp_settings_updated = false;
@@ -50 +190 @@
     }
     
-    add_action( 'bp_template_title', 'bp_core_screen_general_settings_title' );
-    add_action( 'bp_template_content', 'bp_core_screen_general_settings_content' );
-    
-    bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
-}
-
-function bp_core_screen_general_settings_title() {
-    _e( 'General Settings', 'buddypress' );
-}
-
-function bp_core_screen_general_settings_content() {
-    global $bp, $current_user, $bp_settings_updated, $pass_error; ?>
-
-    <?php if ( $bp_settings_updated && !$pass_error ) { ?>
-        <div id="message" class="updated fade">
-            <p><?php _e( 'Changes Saved.', 'buddypress' ) ?></p>
-        </div>
-    <?php } ?>
-    
-    <?php if ( $pass_error && !$bp_settings_updated ) { ?>
-        <div id="message" class="error fade">
-            <p><?php _e( 'Your passwords did not match', 'buddypress' ) ?></p>
-        </div>  
-    <?php } ?>
-
-    <form action="<?php echo $bp->loggedin_user->domain . 'settings/general' ?>" method="post" class="standard-form" id="settings-form">
-        <label for="email"><?php _e( 'Account Email', 'buddypress' ) ?></label>
-        <input type="text" name="email" id="email" value="<?php echo attribute_escape( $current_user->user_email ); ?>" class="settings-input" />
-            
-        <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ) ?></label>
-        <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ) ?>
-        <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ) ?>
-    
-        <p class="submit"><input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
-        <?php wp_nonce_field('bp_settings_general') ?>
-    </form>
-<?php
-}
-
-/***** NOTIFICATION SETTINGS ******/
-
-function bp_core_screen_notification_settings() {
-    global $current_user, $bp_settings_updated;
-    
-    $bp_settings_updated = false;
-    
-    if ( $_POST['submit'] && check_admin_referer('bp_settings_notifications') ) {
-        if ( $_POST['notifications'] ) {
-            foreach ( $_POST['notifications'] as $key => $value ) {
-                update_usermeta( (int)$current_user->id, $key, $value );
-            }
-        }
-        
-        $bp_settings_updated = true;
-    }
-        
-    add_action( 'bp_template_title', 'bp_core_screen_notification_settings_title' );
-    add_action( 'bp_template_content', 'bp_core_screen_notification_settings_content' );
-    
-    bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
-}
-
-function bp_core_screen_notification_settings_title() {
-    _e( 'Notification Settings', 'buddypress' );
-}
-
-function bp_core_screen_notification_settings_content() {
-    global $bp, $current_user, $bp_settings_updated; ?>
-
-    <?php if ( $bp_settings_updated ) { ?>
-        <div id="message" class="updated fade">
-            <p><?php _e( 'Changes Saved.', 'buddypress' ) ?></p>
-        </div>
-    <?php } ?>
-    
-    <form action="<?php echo $bp->loggedin_user->domain . 'settings/notifications' ?>" method="post" id="settings-form">
-        <h3><?php _e( 'Email Notifications', 'buddypress' ) ?></h3>
-        <p><?php _e( 'Send a notification by email when:', 'buddypress' ) ?></p>
-        
-        <?php do_action( 'bp_notification_settings' ) ?>
-        
-        <p class="submit"><input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>     
-        
-        <?php wp_nonce_field('bp_settings_notifications') ?>
-        
-    </form>
-<?php
-}
-
-/**** DELETE ACCOUNT ****/
-
-function bp_core_screen_delete_account() {
-    global $current_user, $bp_settings_updated, $pass_error;
-    
-    if ( isset( $_POST['delete-account-button'] ) && check_admin_referer('delete-account') ) {
-        if ( !check_admin_referer( 'delete-account' ) )
-            return false;
-        
-        // delete the users account
-        if ( bp_core_delete_account() )
-            bp_core_redirect( site_url() );
-    }
-    
-    $bp_settings_updated = false;
-    $pass_error = false;
-    
-    if ( isset($_POST['submit']) && check_admin_referer('bp_settings_general') ) {
-        require_once( WPINC . '/registration.php' );
-        
-        // Form has been submitted and nonce checks out, lets do it.
-        
-        if ( $_POST['email'] != '' ) {
-            $current_user->user_email = wp_specialchars( trim( $_POST['email'] ));
-        }
-
-        if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
-            if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) ) {
-                $current_user->user_pass = $_POST['pass1'];
-            } else {
-                $pass_error = true;
-            }
-        } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
-            $pass_error = true;
-        } else {
-            unset( $current_user->user_pass );
-        }
-        
-        if ( !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
-            $bp_settings_updated = true;
-    }
-    
     add_action( 'bp_template_title', 'bp_core_screen_delete_account_title' );
     add_action( 'bp_template_content', 'bp_core_screen_delete_account_content' );

trunk/bp-core/bp-core-templatetags.php

@@ -22 +22 @@
     foreach( (array) $bp->bp_nav as $nav_item ) {
         /* If the current component matches the nav item id, then add a highlight CSS class. */
-        if ( $bp->current_component == $nav_item['css_id'] ) {
+        if ( $bp->active_components[$bp->current_component] == $nav_item['css_id'] ) {
             $selected = ' class="current"';
         } else {
@@ -35 +35 @@
             
             if ( function_exists('friends_install') ) {
-                if ( $nav_item['css_id'] == $bp->friends->slug ) {
+                if ( $nav_item['css_id'] == $bp->friends->id ) {
                     if ( friends_check_friendship( $bp->loggedin_user->id, $bp->displayed_user->id ) )
                         $selected = ' class="current"';

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

@@ -940 +940 @@
 }
 
+/* DEPRECATED - use the param 'default_subnav_slug' in bp_core_new_nav_item() */
+function bp_core_add_nav_default( $parent_id, $function, $slug = false, $user_has_access = true, $admin_only = false ) {
+    global $bp;
+    
+    if ( !$user_has_access && !bp_is_home() )
+        return false;
+        
+    if ( $admin_only && !is_site_admin() )
+        return false;
+
+    if ( $bp->current_component == $parent_id && !$bp->current_action ) {
+        if ( function_exists($function) ) {
+            add_action( 'wp', $function, 3 );
+        }
+        
+        if ( $slug )
+            $bp->current_action = $slug;
+    }
+}
+

trunk/bp-forums.php

@@ -3 +3 @@
 /* Define the parent forum ID */
 if ( !defined( 'BP_FORUMS_PARENT_FORUM_ID' ) )
-    define ( 'BP_FORUMS_PARENT_FORUM_ID', 1 );
+    define( 'BP_FORUMS_PARENT_FORUM_ID', 1 );
+    
+if ( !defined( 'BP_FORUMS_SLUG' ) )
+    define( 'BP_FORUMS_SLUG', 'forums' );
 
 require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-bbpress.php' );
@@ -18 +21 @@
     $bp->forums->image_base = BP_PLUGIN_URL . '/bp-forums/images';
     $bp->forums->bbconfig = get_site_option( 'bb-config-location' );
+    $bp->forums->slug = BP_FORUMS_SLUG;
+
+    /* Register this in the active components array */
+    $bp->active_components[$bp->forums->slug] = $bp->forums->id;
 }
 add_action( 'plugins_loaded', 'bp_forums_setup', 5 );

trunk/bp-friends.php

@@ -48 +48 @@
     $bp->friends->slug = BP_FRIENDS_SLUG;
 
+    /* Register this in the active components array */
+    $bp->active_components[$bp->friends->slug] = $bp->friends->id;
 }
 add_action( 'plugins_loaded', 'friends_setup_globals', 5 ); 
@@ -68 +70 @@
     
     /* Add 'Friends' to the main navigation */
-    bp_core_new_nav_item( array( 'name' => __('Friends', 'buddypress'), 'slug' => $bp->friends->slug, 'position' => 60, 'screen_function' => 'friends_screen_my_friends', 'default_subnav_slug' => 'my-friends' ) );
+    bp_core_new_nav_item( array( 'name' => __('Friends', 'buddypress'), 'slug' => $bp->friends->slug, 'position' => 60, 'screen_function' => 'friends_screen_my_friends', 'default_subnav_slug' => 'my-friends', 'item_css_id' => $bp->friends->id ) );
     
     $friends_link = $bp->loggedin_user->domain . $bp->friends->slug . '/';

trunk/bp-groups.php

@@ -131 +131 @@
     $bp->groups->format_notification_function = 'groups_format_notifications';
     $bp->groups->slug = BP_GROUPS_SLUG;
-    
+
+    /* Register this in the active components array */
+    $bp->active_components[$bp->groups->slug] = $bp->groups->id;
+        
     if ( function_exists('bp_wire_install') )
         $bp->groups->table_name_wire = $wpdb->base_prefix . 'bp_groups_wire';
@@ -209 +212 @@
 
     /* Add 'Groups' to the main navigation */
-    bp_core_new_nav_item( array( 'name' => __('Groups', 'buddypress'), 'slug' => $bp->groups->slug, 'position' => 70, 'screen_function' => 'groups_screen_my_groups', 'default_subnav_slug' => 'my-groups' ) );
+    bp_core_new_nav_item( array( 'name' => __('Groups', 'buddypress'), 'slug' => $bp->groups->slug, 'position' => 70, 'screen_function' => 'groups_screen_my_groups', 'default_subnav_slug' => 'my-groups', 'item_css_id' => $bp->groups->id ) );
     
     $groups_link = $bp->loggedin_user->domain . $bp->groups->slug . '/';
@@ -277 +280 @@
 
             if ( $bp->groups->current_group->enable_wire && function_exists('bp_wire_install') )
-                bp_core_new_subnav_item( array( 'name' => __( 'Wire', 'buddypress' ), 'slug' => 'wire', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_wire', 'position' => 50, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-wire'  ) );
+                bp_core_new_subnav_item( array( 'name' => __( 'Wire', 'buddypress' ), 'slug' => BP_WIRE_SLUG, 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_wire', 'position' => 50, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-wire'  ) );
 
             bp_core_new_subnav_item( array( 'name' => __( 'Members', 'buddypress' ), 'slug' => 'members', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_members', 'position' => 60, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-members'  ) );

trunk/bp-groups/bp-groups-classes.php

@@ -12 +12 @@
     var $enable_forum;
     var $date_created;
-    
-    var $avatar_thumb;
-    var $avatar_full;
-    
+
     var $user_dataset;
     
@@ -52 +49 @@
             $this->date_created = strtotime($group->date_created);
             $this->total_member_count = groups_get_groupmeta( $this->id, 'total_member_count' );
-
-            $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
-            
-            if ( !$group->avatar_thumb || strpos( $group->avatar_thumb, 'none-thumbnail' ) )
-                $this->avatar_thumb =  $gravatar_url . md5( $this->id . '@' . $bp->root_domain ) . '?d=identicon&s=50';
-            else
-                $this->avatar_thumb = $group->avatar_thumb;
-            
-            if ( !$group->avatar_full || strpos( $group->avatar_thumb, 'none-' ) )
-                $this->avatar_full = $gravatar_url . md5( $this->id . '@' . $bp->root_domain ) . '?d=identicon&s=150';
-            else
-                $this->avatar_full = $group->avatar_full;
             
             if ( $get_user_dataset ) {
@@ -95 +80 @@
         $this->enable_forum = apply_filters( 'groups_group_enable_forum_before_save', $this->enable_forum, $this->id );
         $this->date_created = apply_filters( 'groups_group_date_created_before_save', $this->date_created, $this->id );
-        $this->avatar_thumb = apply_filters( 'groups_group_avatar_thumb_before_save', $this->avatar_thumb, $this->id );
-        $this->avatar_full = apply_filters( 'groups_group_avatar_full_before_save', $this->avatar_full, $this->id );
 
         do_action( 'groups_group_before_save', $this );
@@ -111 +94 @@
                     enable_wire = %d, 
                     enable_forum = %d, 
-                    date_created = FROM_UNIXTIME(%d), 
-                    avatar_thumb = %s, 
-                    avatar_full = %s
+                    date_created = FROM_UNIXTIME(%d)
                 WHERE
                     id = %d
@@ -125 +106 @@
                     $this->enable_wire, 
                     $this->enable_forum, 
-                    $this->date_created, 
-                    $this->avatar_thumb, 
-                    $this->avatar_full,
+                    $this->date_created,
                     $this->id
             );
@@ -141 +120 @@
                     enable_wire,
                     enable_forum,
-                    date_created,
-                    avatar_thumb,
-                    avatar_full
+                    date_created
                 ) VALUES (
-                    %d, %s, %s, %s, %s, %s, %d, %d, FROM_UNIXTIME(%d), %s, %s
+                    %d, %s, %s, %s, %s, %s, %d, %d, FROM_UNIXTIME(%d)
                 )",
                     $this->creator_id, 
@@ -155 +132 @@
                     $this->enable_wire, 
                     $this->enable_forum,
-                    $this->date_created, 
-                    $this->avatar_thumb, 
-                    $this->avatar_full 
+                    $this->date_created
             );
         }

trunk/bp-messages.php

@@ -85 +85 @@
     $bp->messages->format_notification_function = 'messages_format_notifications';
     $bp->messages->slug = BP_MESSAGES_SLUG;
+
+    /* Register this in the active components array */
+    $bp->active_components[$bp->messages->slug] = $bp->messages->id;
 }
 add_action( 'plugins_loaded', 'messages_setup_globals', 5 );    
@@ -111 +114 @@
 
     /* Add 'Messages' to the main navigation */
-    bp_core_new_nav_item( array( 'name' => __('Messages', 'buddypress'), 'slug' => $bp->messages->slug, 'position' => 50, 'show_for_displayed_user' => false, 'screen_function' => 'messages_screen_inbox', 'default_subnav_slug' => 'inbox'  ) );
+    bp_core_new_nav_item( array( 'name' => __('Messages', 'buddypress'), 'slug' => $bp->messages->slug, 'position' => 50, 'show_for_displayed_user' => false, 'screen_function' => 'messages_screen_inbox', 'default_subnav_slug' => 'inbox', 'item_css_id' => $bp->messages->id ) );
     
     $messages_link = $bp->loggedin_user->domain . $bp->messages->slug . '/';

trunk/bp-status.php

@@ -5 +5 @@
 require ( BP_PLUGIN_DIR . '/bp-status/bp-status-templatetags.php' );
 require ( BP_PLUGIN_DIR . '/bp-status/bp-status-filters.php' );
+
+function bp_status_setup_globals() {
+    global $bp, $wpdb;
+
+    /* For internal identification */
+    $bp->status->id = 'status';
+    $bp->status->slug = BP_STATUS_SLUG;
+
+    /* Register this in the active components array */
+    $bp->active_components[$bp->status->slug] = $bp->status->id;
+}
+add_action( 'plugins_loaded', 'bp_status_setup_globals', 5 );   
+add_action( 'admin_menu', 'bp_status_setup_globals', 1 );
 
 function bp_status_record_activity( $user_id, $content, $primary_link ) {

trunk/bp-wire.php

@@ -24 +24 @@
     
     $bp->wire->slug = BP_WIRE_SLUG;
+    
+    /* Register this in the active components array */
+    $bp->active_components[$bp->wire->slug] = $bp->wire->id;
 }
 add_action( 'plugins_loaded', 'bp_wire_setup_globals', 5 ); 
@@ -32 +35 @@
 
     /* Add 'Wire' to the main navigation */
-    bp_core_new_nav_item( array( 'name' => __('Wire', 'buddypress'), 'slug' => $bp->wire->slug, 'position' => 40, 'screen_function' => 'bp_wire_screen_latest', 'default_subnav_slug' => 'all-posts', '' ) );
+    bp_core_new_nav_item( array( 'name' => __('Wire', 'buddypress'), 'slug' => $bp->wire->slug, 'position' => 40, 'screen_function' => 'bp_wire_screen_latest', 'default_subnav_slug' => 'all-posts', 'item_css_id' => $bp->wire->id ) );
 
     $wire_link = $bp->loggedin_user->domain . $bp->wire->slug . '/';

trunk/bp-wire/bp-wire-templatetags.php

@@ -29 +29 @@
             
         } else {
-            $this->table_name = $bp->{$component_slug}->table_name_wire;
+            $this->table_name = $bp->{$bp->active_components[$component_slug]}->table_name_wire;
         }
         
@@ -83 +83 @@
             return true;
         } elseif ( $this->current_wire_post + 1 == $this->wire_post_count ) {
-            do_action('loop_end');
+            do_action('bp_wire_loop_end');
             // Do some cleaning up after the loop
             $this->rewind_wire_posts();
@@ -99 +99 @@
 
         if ( 0 == $this->current_wire_post ) // loop has just started
-            do_action('loop_start');
+            do_action('bp_wire_loop_start');
     }
 }
@@ -316 +316 @@
             return apply_filters( 'bp_get_wire_get_action', $bp->displayed_user->domain . $bp->wire->slug . '/post/' );
         } else {
-            return apply_filters( 'bp_get_wire_get_action', site_url() . '/' . $bp->{$bp->current_component}->slug . '/' . $uri . '/' . $bp->wire->slug . '/post/' );
+            return apply_filters( 'bp_get_wire_get_action', site_url() . '/' . $bp->{$bp->active_components[$bp->current_component]}->slug . '/' . $uri . '/' . $bp->wire->slug . '/post/' );
         }
     }

trunk/bp-xprofile.php

@@ -141 +141 @@
     $bp->profile->format_notification_function = 'xprofile_format_notifications';
     $bp->profile->slug = BP_XPROFILE_SLUG;
-    
+
+    /* Register this in the active components array */
+    $bp->active_components[$bp->profile->slug] = $bp->profile->id;
+        
     $bp->profile->field_types = apply_filters( 'xprofile_field_types', array( 'textbox', 'textarea', 'radio', 'checkbox', 'selectbox', 'multiselectbox', 'datebox' ) );
 
@@ -200 +203 @@
     
     /* Add 'Profile' to the main navigation */
-    bp_core_new_nav_item( array( 'name' => __('Profile', 'buddypress'), 'slug' => $bp->profile->slug, 'position' => 20, 'screen_function' => 'xprofile_screen_display_profile', 'default_subnav_slug' => 'public' ) );
+    bp_core_new_nav_item( array( 'name' => __('Profile', 'buddypress'), 'slug' => $bp->profile->slug, 'position' => 20, 'screen_function' => 'xprofile_screen_display_profile', 'default_subnav_slug' => 'public', 'item_css_id' => $bp->profile->id ) );
 
     $profile_link = $bp->loggedin_user->domain . $bp->profile->slug . '/';