Changeset 3778

Timestamp:

01/21/2011 12:03:25 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Move more user functions out of core component and into user component. Fixes to loaders. More code clean-up.

Location:

trunk

Files:

• bp-activity/bp-activity-loader.php (modified) (8 diffs)
• bp-activity/bp-activity-template.php (modified) (21 diffs)
• bp-blogs/bp-blogs-classes.php (modified) (3 diffs)
• bp-blogs/bp-blogs-functions.php (modified) (3 diffs)
• bp-blogs/bp-blogs-loader.php (modified) (2 diffs)
• bp-blogs/bp-blogs-template.php (modified) (2 diffs)
• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-core/bp-core-template.php (modified) (10 diffs)
• bp-forums/bp-forums-loader.php (modified) (1 diff)
• bp-forums/bp-forums-template.php (modified) (2 diffs)
• bp-friends/bp-friends-classes.php (modified) (1 diff)
• bp-friends/bp-friends-template.php (modified) (1 diff)
• bp-groups/bp-groups-classes.php (modified) (6 diffs)
• bp-groups/bp-groups-loader.php (modified) (4 diffs)
• bp-groups/bp-groups-template.php (modified) (10 diffs)
• bp-settings/bp-settings-loader.php (modified) (6 diffs)
• bp-users/bp-users-functions.php (modified) (1 diff)
• bp-users/bp-users-loader.php (modified) (8 diffs)
• bp-users/bp-users-template.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)

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

@@ -44 +44 @@
         $this->table_name      = $bp->table_prefix . 'bp_activity';
         $this->table_name_meta = $bp->table_prefix . 'bp_activity_meta';
+        
+        // Register this in the active components array
+        $bp->active_components[$this->id] = $this->id;
+
+        // The default text for the blogs directory search box
+        $bp->default_search_strings[$this->id] = __( 'Search Activity...', 'buddypress' );      
     }
 
@@ -69 +75 @@
         bp_core_new_nav_item( array(
             'name'                => __( 'Activity', 'buddypress' ),
-            'slug'                => $bp->activity->slug,
+            'slug'                => $this->slug,
             'position'            => 10,
             'screen_function'     => 'bp_activity_screen_my_activity',
             'default_subnav_slug' => 'just-me',
-            'item_css_id'         => $bp->activity->id )
+            'item_css_id'         => $this->id )
         );
 
@@ -83 +89 @@
         $user_domain   = ( isset( $bp->displayed_user->domain ) )               ? $bp->displayed_user->domain               : $bp->loggedin_user->domain;
         $user_login    = ( isset( $bp->displayed_user->userdata->user_login ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
-        $activity_link = $user_domain . $bp->activity->slug . '/';
+        $activity_link = $user_domain . $this->slug . '/';
 
         // Add the subnav items to the activity nav item if we are using a theme that supports this
@@ -90 +96 @@
             'slug'            => 'just-me',
             'parent_url'      => $activity_link,
-            'parent_slug'     => $bp->activity->slug,
+            'parent_slug'     => $this->slug,
             'screen_function' => 'bp_activity_screen_my_activity',
             'position'        => 10
@@ -101 +107 @@
                 'slug'            => BP_FRIENDS_SLUG,
                 'parent_url'      => $activity_link,
-                'parent_slug'     => $bp->activity->slug,
+                'parent_slug'     => $this->slug,
                 'screen_function' => 'bp_activity_screen_friends',
                 'position'        => 20,
@@ -114 +120 @@
                 'slug'            => BP_GROUPS_SLUG,
                 'parent_url'      => $activity_link,
-                'parent_slug'     => $bp->activity->slug,
+                'parent_slug'     => $this->slug,
                 'screen_function' => 'bp_activity_screen_groups',
                 'position'        => 30,
@@ -126 +132 @@
             'slug'            => 'favorites',
             'parent_url'      => $activity_link,
-            'parent_slug'     => $bp->activity->slug,
+            'parent_slug'     => $this->slug,
             'screen_function' => 'bp_activity_screen_favorites',
             'position'        => 40,
@@ -137 +143 @@
             'slug'            => 'mentions',
             'parent_url'      => $activity_link,
-            'parent_slug'     => $bp->activity->slug,
+            'parent_slug'     => $this->slug,
             'screen_function' => 'bp_activity_screen_mentions',
             'position'        => 50,

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

@@ -218 +218 @@
      * pass their parameters directly to the loop.
      */
-    $user_id = false;
-    $include = false;
-    $exclude = false;
-    $in = false;
+    $user_id     = false;
+    $include     = false;
+    $exclude     = false;
+    $in          = false;
     $show_hidden = false;
-    $object = false;
-    $primary_id = false;
+    $object      = false;
+    $primary_id  = false;
 
     // User filtering
@@ -309 +309 @@
                         $primary_id = implode( ',', (array)$groups['groups'] );
 
-                        $user_id = false;
+                        $user_id = 0;
                     }
                     break;
@@ -324 +324 @@
                     $search_terms = '@' . bp_core_get_username( $user_id, $user_nicename, $user_login ) . '<'; // Start search at @ symbol and stop search at closing tag delimiter.
                     $display_comments = 'stream';
-                    $user_id = false;
+                    $user_id = 0;
                     break;
             }
@@ -330 +330 @@
     }
 
-    if ( $max ) {
-        if ( $per_page > $max )
-            $per_page = $max;
-    }
+    // Do not exceed the maximum per page
+    if ( !empty( $max ) && ( (int)$per_page > (int)$max ) )
+        $per_page = $max;
 
     // Support for basic filters in earlier BP versions.
@@ -365 +364 @@
 
         $start_num = intval( ( $activities_template->pag_page - 1 ) * $activities_template->pag_num ) + 1;
-        $from_num = bp_core_number_format( $start_num );
-        $to_num = bp_core_number_format( ( $start_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $start_num + ( $activities_template->pag_num - 1 ) );
-        $total = bp_core_number_format( $activities_template->total_activity_count );
+        $from_num  = bp_core_number_format( $start_num );
+        $to_num    = bp_core_number_format( ( $start_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $start_num + ( $activities_template->pag_num - 1 ) );
+        $total     = bp_core_number_format( $activities_template->total_activity_count );
 
         return sprintf( __( 'Viewing item %1$s to %2$s (of %3$s items)', 'buddypress' ), $from_num, $to_num, $total ) . ' &nbsp; <span class="ajax-loader"></span>';
@@ -393 +392 @@
     
     $remaining_pages = floor( ( $activities_template->total_activity_count - 1 ) / ( $activities_template->pag_num * $activities_template->pag_page ) ); 
-    
-    $has_more_items = (int)$remaining_pages ? true : false;
+    $has_more_items  = (int)$remaining_pages ? true : false;
     
     return apply_filters( 'bp_activity_has_more_items', $has_more_items );
@@ -646 +644 @@
 
         $action = $activities_template->activity->action;
-
         $action = apply_filters( 'bp_get_activity_action_pre_meta', $action, &$activities_template->activity );
 
@@ -661 +658 @@
         global $activities_template;
 
-        /* Backwards compatibility if action is not being used */
+        // Backwards compatibility if action is not being used
         if ( empty( $activities_template->activity->action ) && !empty( $activities_template->activity->content ) )
             $activities_template->activity->content = bp_insert_activity_meta( $activities_template->activity->content );
@@ -744 +741 @@
         extract( $r, EXTR_SKIP );
 
-        /* Get the ID of the parent activity content */
+        // Get the ID of the parent activity content
         if ( !$parent_id = $activities_template->activity->item_id )
             return false;
 
-        /* Get the content of the parent */
+        // Get the content of the parent
         if ( empty( $activities_template->activity_parents[$parent_id] ) )
             return false;
@@ -757 +754 @@
             $content = $activities_template->activity_parents[$parent_id]->action . ' ' . $activities_template->activity_parents[$parent_id]->content;
 
-        /* Remove the time since content for backwards compatibility */
+        // Remove the time since content for backwards compatibility
         $content = str_replace( '<span class="time-since">%s</span>', '', $content );
 
-        /* Remove images */
+        // Remove images
         $content = preg_replace( '/<img[^>]*>/Ui', '', $content );
 
@@ -788 +785 @@
         return apply_filters( 'bp_activity_get_comments', $comments_html );
     }
-        /* TODO: The HTML in this function is temporary and will be moved to the template in a future version. */
+        // TODO: The HTML in this function is temporary and will be moved
+        // to the template in a future version
         function bp_activity_recurse_comments( $comment ) {
             global $activities_template, $bp;
@@ -804 +802 @@
                 $content .= '<div class="acomment-meta"><a href="' . bp_core_get_user_domain( $comment->user_id, $comment->user_nicename, $comment->user_login ) . '">' . apply_filters( 'bp_acomment_name', $comment->user_fullname, $comment ) . '</a> &middot; ' . sprintf( __( '%s ago', 'buddypress' ), bp_core_time_since( $comment->date_recorded ) );
 
-                /* Reply link - the span is so that threaded reply links can be hidden when JS is off. */
+                // Reply link - the span is so that threaded reply links can be
+                // hidden when JS is off.
                 if ( is_user_logged_in() && bp_activity_can_comment_reply( $comment ) )
                     $content .= apply_filters( 'bp_activity_comment_reply_link', '<span class="acomment-replylink"> &middot; <a href="#acomment-' . $comment->id . '" class="acomment-reply" id="acomment-reply-' . $activities_template->activity->id . '">' . __( 'Reply', 'buddypress' ) . '</a></span>', $comment );
 
-                /* Delete link */
+                // Delete link
                 if ( $bp->loggedin_user->is_super_admin || $bp->loggedin_user->id == $comment->user_id ) {
                     $delete_url = wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/?cid=' . $comment->id, 'bp_activity_delete_link' );
@@ -950 +949 @@
     }
 
-function bp_activity_latest_update( $user_id = false ) {
+function bp_activity_latest_update( $user_id = 0 ) {
     echo bp_get_activity_latest_update( $user_id );
 }
-    function bp_get_activity_latest_update( $user_id = false ) {
+    function bp_get_activity_latest_update( $user_id = 0 ) {
         global $bp;
 
@@ -981 +980 @@
         extract( $r, EXTR_SKIP );
 
-        /* Fetch the names of components that have activity recorded in the DB */
+        // Fetch the names of components that have activity recorded in the DB
         $components = BP_Activity_Activity::get_recorded_components();
 
@@ -1022 +1021 @@
             $link = apply_filters( 'bp_get_activity_filter_link_href', $link, $component );
 
-            /* Make sure all core internal component names are translatable */
+            // Make sure all core internal component names are translatable
             $translatable_components = array( __( 'profile', 'buddypress'), __( 'friends', 'buddypress' ), __( 'groups', 'buddypress' ), __( 'status', 'buddypress' ), __( 'blogs', 'buddypress' ) );
 
@@ -1064 +1063 @@
 }
 
-function bp_total_favorite_count_for_user( $user_id = false ) {
+function bp_total_favorite_count_for_user( $user_id = 0 ) {
     echo bp_get_total_favorite_count_for_user( $user_id );
 }
-    function bp_get_total_favorite_count_for_user( $user_id = false ) {
+    function bp_get_total_favorite_count_for_user( $user_id = 0 ) {
         return apply_filters( 'bp_get_total_favorite_count_for_user', bp_activity_total_favorites_for_user( $user_id ) );
     }
 
-function bp_total_mention_count_for_user( $user_id = false ) {
+function bp_total_mention_count_for_user( $user_id = 0 ) {
     echo bp_get_total_favorite_count_for_user( $user_id );
 }
-    function bp_get_total_mention_count_for_user( $user_id = false ) {
+    function bp_get_total_mention_count_for_user( $user_id = 0 ) {
         return apply_filters( 'bp_get_total_mention_count_for_user', get_user_meta( $user_id, 'bp_new_mention_count', true ) );
     }
@@ -1088 +1087 @@
 
         return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->activity->slug . '/?r=' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
+    }
+
+function bp_mentioned_user_display_name( $user_id_or_username ) {
+    echo bp_get_mentioned_user_display_name( $user_id_or_username );
+}
+    function bp_get_mentioned_user_display_name( $user_id_or_username ) {
+        if ( !$name = bp_core_get_user_displayname( $user_id_or_username ) )
+            $name = __( 'a user', 'buddypress' );
+
+        return apply_filters( 'bp_get_mentioned_user_display_name', $name, $user_id_or_username );
     }
 
@@ -1153 +1162 @@
         global $bp;
 
-        $link = '';
-
         if ( $bp->current_component == $bp->profile->slug || 'just-me' == $bp->current_action )
             $link = $bp->displayed_user->domain . $bp->activity->slug . '/feed/';
@@ -1165 +1172 @@
         elseif ( 'mentions' == $bp->current_action )
             $link = $bp->displayed_user->domain . $bp->activity->slug . '/mentions/feed/';
+        else
+            $link = '';
 
         return apply_filters( 'bp_get_activities_member_rss_link', $link );
@@ -1171 +1180 @@
 
 
-/* Template tags for RSS feed output */
+/** Template tags for RSS feed output *****************************************/
 
 function bp_activity_feed_item_guid() {
@@ -1242 +1251 @@
  * @since 1.3
  */
-function bp_dtheme_sitewide_feed() {
+function bp_activity_sitewide_feed() {
 ?>
-<link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> | <?php _e( 'Site Wide Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_sitewide_activity_feed_link() ?>" />
+
+    <link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> | <?php _e( 'Site Wide Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_sitewide_activity_feed_link() ?>" />
+
 <?php
 }
-add_action( 'bp_head', 'bp_dtheme_sitewide_feed' );
-
-/**
- * Template tag so we can hook member activity feed to <head>
- *
- * @since 1.3
- */
-function bp_dtheme_member_feed() {
-    if ( !bp_is_member() )
-        return;
+add_action( 'bp_head', 'bp_activity_sitewide_feed' );
+
 ?>
-        <link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> | <?php bp_displayed_user_fullname() ?> | <?php _e( 'Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_member_activity_feed_link() ?>" />
-<?php
-}
-add_action( 'bp_head', 'bp_dtheme_member_feed' );
-
-/**
- * Template tag so we can hook group activity feed to <head>
- *
- * @since 1.3
- */
-function bp_dtheme_group_feed() {
-    if ( !bp_is_active( 'groups' ) || !bp_is_group() )
-        return;
-?>
-        <link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> | <?php bp_current_group_name() ?> | <?php _e( 'Group Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_group_activity_feed_link() ?>" />
-<?php
-}
-add_action( 'bp_head', 'bp_dtheme_group_feed' );
-?>

trunk/bp-blogs/bp-blogs-classes.php

@@ -69 +69 @@
     /* Static Functions */
 
-    function get( $type, $limit = false, $page = false, $user_id = false, $search_terms = false ) {
+    function get( $type, $limit = false, $page = false, $user_id = 0, $search_terms = false ) {
         global $bp, $wpdb;
 
@@ -154 +154 @@
     }
 
-    function get_blogs_for_user( $user_id = false, $show_hidden = false ) {
+    function get_blogs_for_user( $user_id = 0, $show_hidden = false ) {
         global $bp, $wpdb;
 
@@ -183 +183 @@
     }
 
-    function get_blog_ids_for_user( $user_id = false ) {
+    function get_blog_ids_for_user( $user_id = 0 ) {
         global $bp, $wpdb;
 

trunk/bp-blogs/bp-blogs-functions.php

@@ -129 +129 @@
 add_action( 'update_option_blogdescription', 'bp_blogs_update_option_blogdescription', 10, 2 );
 
-function bp_blogs_record_post( $post_id, $post, $user_id = false ) {
+function bp_blogs_record_post( $post_id, $post, $user_id = 0 ) {
     global $bp, $wpdb;
 
@@ -328 +328 @@
 add_action( 'remove_user_from_blog', 'bp_blogs_remove_blog_for_user', 10, 2 );
 
-function bp_blogs_remove_post( $post_id, $blog_id = false, $user_id = false ) {
+function bp_blogs_remove_post( $post_id, $blog_id = false, $user_id = 0 ) {
     global $current_blog, $bp;
 
@@ -368 +368 @@
 }
 
-function bp_blogs_total_blogs_for_user( $user_id = false ) {
+function bp_blogs_total_blogs_for_user( $user_id = 0 ) {
     global $bp;
 

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

@@ -45 +45 @@
 
         // Notifications
-        $bp->blogs->notification_callback = 'bp_blogs_format_notifications';
+        $this->notification_callback = 'bp_blogs_format_notifications';
 
         // Register this in the active components array
-        $bp->active_components[$this->slug] = $this->id;
+        $bp->active_components[$this->id] = $this->id;
 
         // The default text for the blogs directory search box
-        $bp->default_search_strings[$this->slug] = __( 'Search Blogs...', 'buddypress' );
+        $bp->default_search_strings[$this->id] = __( 'Search Blogs...', 'buddypress' );
     }
 
@@ -89 +89 @@
         bp_core_new_nav_item( array(
             'name'                => sprintf( __( 'Blogs <span>(%d)</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ),
-            'slug'                => $bp->blogs->slug,
+            'slug'                => $this->slug,
             'position'            => 30,
             'screen_function'     => 'bp_blogs_screen_my_blogs',
             'default_subnav_slug' => 'my-blogs',
-            'item_css_id'         => $bp->blogs->id
+            'item_css_id'         => $this->id
         ) );
 

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

@@ -119 +119 @@
      */
     $type = 'active';
-    $user_id = false;
+    $user_id = 0;
     $search_terms = null;
 
@@ -295 +295 @@
     add_filter( 'bp_get_total_blog_count', 'bp_core_number_format' );
 
-function bp_total_blog_count_for_user( $user_id = false ) {
+function bp_total_blog_count_for_user( $user_id = 0 ) {
     echo bp_get_total_blog_count_for_user( $user_id );
 }
-    function bp_get_total_blog_count_for_user( $user_id = false ) {
+    function bp_get_total_blog_count_for_user( $user_id = 0 ) {
         return apply_filters( 'bp_get_total_blog_count_for_user', bp_blogs_total_blogs_for_user( $user_id ) );
     }

trunk/bp-core/bp-core-classes.php

@@ -107 +107 @@
     /* Static Functions */
 
-    function get_users( $type, $limit = null, $page = 1, $user_id = false, $include = false, $search_terms = false, $populate_extras = true, $exclude = false ) {
+    function get_users( $type, $limit = null, $page = 1, $user_id = 0, $include = false, $search_terms = false, $populate_extras = true, $exclude = false ) {
         global $wpdb, $bp;
 

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

@@ -1 +1 @@
 <?php
-/***
- * Members template loop that will allow you to loop all members or friends of a member
- * if you pass a user_id.
- */
-
-class BP_Core_Members_Template {
-    var $current_member = -1;
-    var $member_count;
-    var $members;
-    var $member;
-
-    var $in_the_loop;
-
-    var $pag_page;
-    var $pag_num;
-    var $pag_links;
-    var $total_member_count;
-
-    function bp_core_members_template( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude ) {
-        global $bp;
-
-        $this->pag_page  = !empty( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : (int)$page_number;
-        $this->pag_num   = !empty( $_REQUEST['num'] )   ? intval( $_REQUEST['num'] )   : (int)$per_page;
-        $this->type      = $type;
-
-        if ( !$this->pag_num )
-            $this->pag_num = 1;
-
-        if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] )
-            $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page, $populate_extras, $exclude );
-        else if ( false !== $include )
-            $this->members = BP_Core_User::get_specific_users( $include, $this->pag_num, $this->pag_page, $populate_extras );
-        else
-            $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras, 'exclude' => $exclude ) );
-
-        if ( !$max || $max >= (int)$this->members['total'] )
-            $this->total_member_count = (int)$this->members['total'];
-        else
-            $this->total_member_count = (int)$max;
-
-        $this->members = $this->members['users'];
-
-        if ( $max ) {
-            if ( $max >= count( $this->members ) ) {
-                $this->member_count = count( $this->members );
-            } else {
-                $this->member_count = (int)$max;
-            }
-        } else {
-            $this->member_count = count( $this->members );
-        }
-
-        if ( (int)$this->total_member_count && (int)$this->pag_num ) {
-            $this->pag_links = paginate_links( array(
-                'base'      => add_query_arg( 'upage', '%#%' ),
-                'format'    => '',
-                'total'     => ceil( (int)$this->total_member_count / (int)$this->pag_num ),
-                'current'   => (int) $this->pag_page,
-                'prev_text' => '&larr;',
-                'next_text' => '&rarr;',
-                'mid_size'   => 1
-            ) );
-        }
-    }
-
-    function has_members() {
-        if ( $this->member_count )
-            return true;
-
-        return false;
-    }
-
-    function next_member() {
-        $this->current_member++;
-        $this->member = $this->members[$this->current_member];
-
-        return $this->member;
-    }
-
-    function rewind_members() {
-        $this->current_member = -1;
-        if ( $this->member_count > 0 ) {
-            $this->member = $this->members[0];
-        }
-    }
-
-    function members() {
-        if ( $this->current_member + 1 < $this->member_count ) {
-            return true;
-        } elseif ( $this->current_member + 1 == $this->member_count ) {
-            do_action('member_loop_end');
-            // Do some cleaning up after the loop
-            $this->rewind_members();
-        }
-
-        $this->in_the_loop = false;
-        return false;
-    }
-
-    function the_member() {
-        global $member, $bp;
-
-        $this->in_the_loop = true;
-        $this->member = $this->next_member();
-
-        if ( 0 == $this->current_member ) // loop has just started
-            do_action('member_loop_start');
-    }
-}
-
-function bp_rewind_members() {
-    global $members_template;
-
-    return $members_template->rewind_members();
-}
-
-function bp_has_members( $args = '' ) {
-    global $bp, $members_template;
-
-    /***
-     * Set the defaults based on the current page. Any of these will be overridden
-     * if arguments are directly passed into the loop. Custom plugins should always
-     * pass their parameters directly to the loop.
-     */
-    $type = 'active';
-    $user_id = false;
-    $page = 1;
-    $search_terms = null;
-
-    // User filtering
-    if ( !empty( $bp->displayed_user->id ) )
-        $user_id = $bp->displayed_user->id;
-
-    // type: active ( default ) | random | newest | popular | online | alphabetical
-    $defaults = array(
-        'type' => $type,
-        'page' => $page,
-        'per_page' => 20,
-        'max' => false,
-
-        'include' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to only show these users
-        'exclude' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to exclude these users
-
-        'user_id' => $user_id, // Pass a user_id to only show friends of this user
-        'search_terms' => $search_terms, // Pass search_terms to filter users by their profile data
-
-        'populate_extras' => true // Fetch usermeta? Friend count, last active etc.
-    );
-
-    $r = wp_parse_args( $args, $defaults );
-    extract( $r );
-
-    // Pass a filter if ?s= is set.
-    if ( is_null( $search_terms ) ) {
-        if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
-            $search_terms = $_REQUEST['s'];
-        else
-            $search_terms = false;
-    }
-
-    if ( $max ) {
-        if ( $per_page > $max )
-            $per_page = $max;
-    }
-
-    // Make sure we return no members if we looking at friendship requests and there are none.
-    if ( empty( $include ) && bp_is_current_component( $bp->friends->slug ) && 'requests' == $bp->current_action )
-        return false;
-
-    $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras, $exclude );
-    return apply_filters( 'bp_has_members', $members_template->has_members(), $members_template );
-}
-
-function bp_the_member() {
-    global $members_template;
-    return $members_template->the_member();
-}
-
-function bp_members() {
-    global $members_template;
-    return $members_template->members();
-}
-
-function bp_members_pagination_count() {
-    echo bp_get_members_pagination_count();
-}
-    function bp_get_members_pagination_count() {
-        global $bp, $members_template;
-
-        $start_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
-        $from_num = bp_core_number_format( $start_num );
-        $to_num = bp_core_number_format( ( $start_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $start_num + ( $members_template->pag_num - 1 ) );
-        $total = bp_core_number_format( $members_template->total_member_count );
-
-        if ( 'active' == $members_template->type )
-            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s active members)', 'buddypress' ), $from_num, $to_num, $total );
-        else if ( 'popular' == $members_template->type )
-            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members with friends)', 'buddypress' ), $from_num, $to_num, $total );
-        else if ( 'online' == $members_template->type )
-            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members online)', 'buddypress' ), $from_num, $to_num, $total );
-        else
-            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total );
-
-        return apply_filters( 'bp_members_pagination_count', $pag . '<span class="ajax-loader"></span>' );
-    }
-
-function bp_members_pagination_links() {
-    echo bp_get_members_pagination_links();
-}
-    function bp_get_members_pagination_links() {
-        global $members_template;
-
-        return apply_filters( 'bp_get_members_pagination_links', $members_template->pag_links );
-    }
-
-/**
- * bp_member_user_id()
- *
- * Echo id from bp_get_member_user_id()
- *
- * @uses bp_get_member_user_id()
- */
-function bp_member_user_id() {
-    echo bp_get_member_user_id();
-}
-    /**
-     * bp_get_member_user_id()
-     *
-     * Get the id of the user in a members loop
-     *
-     * @global object $members_template
-     * @return string Members id
-     */
-    function bp_get_member_user_id() {
-        global $members_template;
-
-        return apply_filters( 'bp_get_member_user_id', $members_template->member->id );
-    }
-
-/**
- * bp_member_user_nicename()
- *
- * Echo nicename from bp_get_member_user_nicename()
- *
- * @uses bp_get_member_user_nicename()
- */
-function bp_member_user_nicename() {
-    echo bp_get_member_user_nicename();
-}
-    /**
-     * bp_get_member_user_nicename()
-     *
-     * Get the nicename of the user in a members loop
-     *
-     * @global object $members_template
-     * @return string Members nicename
-     */
-    function bp_get_member_user_nicename() {
-        global $members_template;
-        return apply_filters( 'bp_get_member_user_nicename', $members_template->member->user_nicename );
-    }
-
-/**
- * bp_member_user_login()
- *
- * Echo login from bp_get_member_user_login()
- *
- * @uses bp_get_member_user_login()
- */
-function bp_member_user_login() {
-    echo bp_get_member_user_login();
-}
-    /**
-     * bp_get_member_user_login()
-     *
-     * Get the login of the user in a members loop
-     *
-     * @global object $members_template
-     * @return string Members login
-     */
-    function bp_get_member_user_login() {
-        global $members_template;
-        return apply_filters( 'bp_get_member_user_login', $members_template->member->user_login );
-    }
-
-/**
- * bp_member_user_email()
- *
- * Echo email address from bp_get_member_user_email()
- *
- * @uses bp_get_member_user_email()
- */
-function bp_member_user_email() {
-    echo bp_get_member_user_email();
-}
-    /**
-     * bp_get_member_user_email()
-     *
-     * Get the email address of the user in a members loop
-     *
-     * @global object $members_template
-     * @return string Members email address
-     */
-    function bp_get_member_user_email() {
-        global $members_template;
-        return apply_filters( 'bp_get_member_user_email', $members_template->member->user_email );
-    }
-
-function bp_member_is_loggedin_user() {
-    global $bp, $members_template;
-    return apply_filters( 'bp_member_is_loggedin_user', $bp->loggedin_user->id == $members_template->member->id ? true : false );
-}
-
-function bp_member_avatar( $args = '' ) {
-    echo apply_filters( 'bp_member_avatar', bp_get_member_avatar( $args ) );
-}
-    function bp_get_member_avatar( $args = '' ) {
-        global $bp, $members_template;
-
-        $defaults = array(
-            'type' => 'thumb',
-            'width' => false,
-            'height' => false,
-            'class' => 'avatar',
-            'id' => false,
-            'alt' => __( 'Profile picture of %s', 'buddypress' )
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-
-        return apply_filters( 'bp_get_member_avatar', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->id, 'type' => $type, 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $members_template->member->user_email ) ) );
-    }
-
-function bp_member_permalink() {
-    echo bp_get_member_permalink();
-}
-    function bp_get_member_permalink() {
-        global $members_template;
-
-        return apply_filters( 'bp_get_member_permalink', bp_core_get_user_domain( $members_template->member->id, $members_template->member->user_nicename, $members_template->member->user_login ) );
-    }
-    function bp_member_link() { echo bp_get_member_permalink(); }
-    function bp_get_member_link() { return bp_get_member_permalink(); }
-
-function bp_member_name() {
-    echo apply_filters( 'bp_member_name', bp_get_member_name() );
-}
-    function bp_get_member_name() {
-        global $members_template;
-
-        if ( empty($members_template->member->fullname) )
-            $members_template->member->fullname = $members_template->member->display_name;
-
-        return apply_filters( 'bp_get_member_name', $members_template->member->fullname );
-    }
-    add_filter( 'bp_get_member_name', 'wp_filter_kses' );
-    add_filter( 'bp_get_member_name', 'stripslashes' );
-    add_filter( 'bp_get_member_name', 'strip_tags' );
-
-function bp_member_last_active() {
-    echo bp_get_member_last_active();
-}
-    function bp_get_member_last_active() {
-        global $members_template;
-
-        $last_activity = bp_core_get_last_activity( $members_template->member->last_activity, __( 'active %s ago', 'buddypress' ) );
-
-        return apply_filters( 'bp_member_last_active', $last_activity );
-    }
-
-function bp_member_latest_update( $args = '' ) {
-    echo bp_get_member_latest_update( $args );
-}
-    function bp_get_member_latest_update( $args = '' ) {
-        global $members_template, $bp;
-
-        $defaults = array(
-            'length' => 70
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-
-        if ( !isset( $members_template->member->latest_update ) || !$update = maybe_unserialize( $members_template->member->latest_update ) )
-            return false;
-
-        $update_content = apply_filters( 'bp_get_activity_latest_update', strip_tags( bp_create_excerpt( $update['content'], $length ) ) );
-
-        if ( !empty( $update['id'] ) )
-            $update_content .= ' &middot; <a href="' . $bp->root_domain . '/' . $bp->activity->root_slug . '/p/' . $update['id'] . '">' . __( 'View', 'buddypress' ) . '</a>';
-
-        return apply_filters( 'bp_get_member_latest_update', $update_content );
-    }
-
-function bp_member_profile_data( $args = '' ) {
-    echo bp_get_member_profile_data( $args );
-}
-    function bp_get_member_profile_data( $args = '' ) {
-        global $members_template;
-
-        if ( !bp_is_active( 'xprofile' ) )
-            return false;
-
-        $defaults = array(
-            'field' => false, // Field name
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-
-        // Populate the user if it hasn't been already.
-        if ( empty( $members_template->member->profile_data ) && method_exists( 'BP_XProfile_ProfileData', 'get_all_for_user' ) )
-            $members_template->member->profile_data = BP_XProfile_ProfileData::get_all_for_user( $members_template->member->id );
-
-        $data = xprofile_format_profile_field( $members_template->member->profile_data[$field]['field_type'], $members_template->member->profile_data[$field]['field_data'] );
-
-        return apply_filters( 'bp_get_member_profile_data', $data );
-    }
-
-function bp_member_registered() {
-    echo bp_get_member_registered();
-}
-    function bp_get_member_registered() {
-        global $members_template;
-
-        $registered = esc_attr( bp_core_get_last_activity( $members_template->member->user_registered, __( 'registered %s ago', 'buddypress' ) ) );
-
-        return apply_filters( 'bp_member_last_active', $registered );
-    }
-
-function bp_member_random_profile_data() {
-    global $members_template;
-
-    if ( function_exists( 'xprofile_get_random_profile_data' ) ) { ?>
-        <?php $random_data = xprofile_get_random_profile_data( $members_template->member->id, true ); ?>
-            <strong><?php echo wp_filter_kses( $random_data[0]->name ) ?></strong>
-            <?php echo wp_filter_kses( $random_data[0]->value ) ?>
-    <?php }
-}
-
-function bp_member_hidden_fields() {
-    if ( isset( $_REQUEST['s'] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['s'] ) . '" name="search_terms" />';
-    }
-
-    if ( isset( $_REQUEST['letter'] ) ) {
-        echo '<input type="hidden" id="selected_letter" value="' . esc_attr( $_REQUEST['letter'] ) . '" name="selected_letter" />';
-    }
-
-    if ( isset( $_REQUEST['members_search'] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['members_search'] ) . '" name="search_terms" />';
-    }
-}
-
-function bp_directory_members_search_form() {
-    global $bp;
-
-    $default_search_value = bp_get_search_default_text();
-    $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
-
-    ?>
-    <form action="" method="get" id="search-members-form">
-        <label><input type="text" name="s" id="members_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
-        <input type="submit" id="members_search_submit" name="members_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
-    </form>
-<?php
-}
-
-function bp_total_site_member_count() {
-    echo bp_get_total_site_member_count();
-}
-    function bp_get_total_site_member_count() {
-        return apply_filters( 'bp_get_total_site_member_count', bp_core_number_format( bp_core_get_total_member_count() ) );
-    }
-
-
-/** Navigation and other misc template tags **/
-
-/**
- * bp_get_nav()
- * TEMPLATE TAG
- *
- * Uses the $bp->bp_nav global to render out the navigation within a BuddyPress install.
- * Each component adds to this navigation array within its own [component_name]_setup_nav() function.
- *
- * This navigation array is the top level navigation, so it contains items such as:
- *      [Blog, Profile, Messages, Groups, Friends] ...
- *
- * The function will also analyze the current component the user is in, to determine whether
- * or not to highlight a particular nav item.
- *
- * @package BuddyPress Core
- * @todo Move to a back-compat file?
- * @deprecated Does not seem to be called anywhere in the core
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- */
-function bp_get_loggedin_user_nav() {
-    global $bp, $current_blog;
-
-    /* Loop through each navigation item */
-    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_is_directory() && $bp->active_components[$bp->current_component] == $nav_item['css_id'] )
-            $selected = ' class="current selected"';
-        else
-            $selected = '';
-
-        /* If we are viewing another person (current_userid does not equal loggedin_user->id)
-           then check to see if the two users are friends. if they are, add a highlight CSS class
-           to the friends nav item if it exists. */
-        if ( !bp_is_my_profile() && $bp->displayed_user->id ) {
-            $selected = '';
-
-            if ( bp_is_active( 'friends' ) ) {
-                if ( $nav_item['css_id'] == $bp->friends->id ) {
-                    if ( friends_check_friendship( $bp->loggedin_user->id, $bp->displayed_user->id ) )
-                        $selected = ' class="current selected"';
-                }
-            }
-        }
-
-        /* echo out the final list item */
-        echo apply_filters( 'bp_get_loggedin_user_nav_' . $nav_item['css_id'], '<li id="li-nav-' . $nav_item['css_id'] . '" ' . $selected . '><a id="my-' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a></li>', &$nav_item );
-    }
-
-    /* Always add a log out list item to the end of the navigation */
-    if ( function_exists( 'wp_logout_url' ) ) {
-        $logout_link = '<li><a id="wp-logout" href="' .  wp_logout_url( $bp->root_domain ) . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
-    } else {
-        $logout_link = '<li><a id="wp-logout" href="' . site_url() . '/wp-login.php?action=logout&amp;redirect_to=' . $bp->root_domain . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
-    }
-
-    echo apply_filters( 'bp_logout_nav_link', $logout_link );
-}
-
-/**
- * Uses the $bp->bp_nav global to render out the user navigation when viewing another user other than
- * yourself.
- *
- * @package BuddyPress Core
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- */
-function bp_get_displayed_user_nav() {
-    global $bp;
-
-    foreach ( (array)$bp->bp_nav as $user_nav_item ) {
-        if ( !$user_nav_item['show_for_displayed_user'] && !bp_is_my_profile() )
-            continue;
-
-        if ( $bp->current_component == $user_nav_item['slug'] )
-            $selected = ' class="current selected"';
-        else
-            $selected = '';
-
-        if ( $bp->loggedin_user->domain )
-            $link = str_replace( $bp->loggedin_user->domain, $bp->displayed_user->domain, $user_nav_item['link'] );
-        else
-            $link = $bp->displayed_user->domain . $user_nav_item['link'];
-
-        echo apply_filters( 'bp_get_displayed_user_nav_' . $user_nav_item['css_id'], '<li id="' . $user_nav_item['css_id'] . '-personal-li" ' . $selected . '><a id="user-' . $user_nav_item['css_id'] . '" href="' . $link . '">' . $user_nav_item['name'] . '</a></li>', &$user_nav_item );
-    }
-}
 
 /**
@@ -591 +28 @@
         return false;
 
-    /* Loop through each navigation item */
+    // Loop through each navigation item
     foreach ( (array)$bp->bp_options_nav[$component_index] as $subnav_item ) {
         if ( !$subnav_item['user_has_access'] )
             continue;
 
-        /* If the current action or an action variable matches the nav item id, then add a highlight CSS class. */
+        // If the current action or an action variable matches the nav item id, then add a highlight CSS class.
         if ( $subnav_item['slug'] == $bp->current_action ) {
             $selected = ' class="current selected"';
@@ -603 +40 @@
         }
 
-        /* echo out the final list item */
+        // echo out the final list item
         echo apply_filters( 'bp_get_options_nav_' . $subnav_item['css_id'], '<li id="' . $subnav_item['css_id'] . '-personal-li" ' . $selected . '><a id="' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>', $subnav_item );
     }
@@ -648 +85 @@
     global $comment;
 
-    if ( function_exists('bp_core_fetch_avatar') ) {
+    if ( function_exists( 'bp_core_fetch_avatar' ) )
         echo apply_filters( 'bp_comment_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'type' => 'thumb' ) ) );
-    } else if ( function_exists('get_avatar') ) {
+    else if ( function_exists('get_avatar') )
         get_avatar();
-    }
 }
 
@@ -658 +94 @@
     global $post;
 
-    if ( function_exists('bp_core_fetch_avatar') ) {
+    if ( function_exists( 'bp_core_fetch_avatar' ) )
         echo apply_filters( 'bp_post_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $post->post_author, 'type' => 'thumb' ) ) );
-    } else if ( function_exists('get_avatar') ) {
+    else if ( function_exists('get_avatar') )
         get_avatar();
-    }
-}
-
-function bp_loggedin_user_avatar( $args = '' ) {
-    echo bp_get_loggedin_user_avatar( $args );
-}
-    function bp_get_loggedin_user_avatar( $args = '' ) {
-        global $bp;
-
-        $defaults = array(
-            'type'      => 'thumb',
-            'width'     => false,
-            'height'    => false,
-            'html'      => true,
-            'alt' => __( 'Profile picture of %s', 'buddypress' )
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-
-        return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->loggedin_user->id, 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
-    }
-
-function bp_displayed_user_avatar( $args = '' ) {
-    echo bp_get_displayed_user_avatar( $args );
-}
-    function bp_get_displayed_user_avatar( $args = '' ) {
-        global $bp;
-
-        $defaults = array(
-            'type'      => 'thumb',
-            'width'     => false,
-            'height'    => false,
-            'html'      => true,
-            'alt' => __( 'Profile picture of %s', 'buddypress' )
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-
-        return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
-    }
+}
 
 function bp_avatar_admin_step() {
@@ -832 +227 @@
 
 function bp_exists( $component_name ) {
-    if ( function_exists($component_name . '_install') )
+    if ( function_exists( $component_name . '_install' ) )
         return true;
 
@@ -945 +340 @@
     wp_print_styles();
 }
-
-function bp_has_custom_signup_page() {
-    if ( locate_template( array( 'register.php' ), false ) || locate_template( array( '/registration/register.php' ), false ) )
-        return true;
-
-    return false;
-}
-
-function bp_signup_page() {
-    echo bp_get_signup_page();
-}
-    function bp_get_signup_page() {
-        global $bp;
-
-        if ( bp_has_custom_signup_page() )
-            $page = $bp->root_domain . '/' . BP_REGISTER_SLUG;
-        else
-            $page = $bp->root_domain . '/wp-signup.php';
-
-        return apply_filters( 'bp_get_signup_page', $page );
-    }
-
-function bp_has_custom_activation_page() {
-    if ( locate_template( array( 'activate.php' ), false ) || locate_template( array( '/registration/activate.php' ), false ) )
-        return true;
-
-    return false;
-}
-
-function bp_activation_page() {
-    echo bp_get_activation_page();
-}
-    function bp_get_activation_page() {
-        global $bp;
-
-        if ( bp_has_custom_activation_page() )
-            $page = trailingslashit( $bp->root_domain ) . BP_ACTIVATION_SLUG;
-        else
-            $page = trailingslashit( $bp->root_domain ) . 'wp-activate.php';
-
-        return apply_filters( 'bp_get_activation_page', $page );
-    }
 
 /**
@@ -1194 +547 @@
     add_filter( 'bp_get_total_member_count', 'bp_core_number_format' );
 
-/*** Signup form template tags **********************/
-
-function bp_signup_username_value() {
-    echo bp_get_signup_username_value();
-}
-    function bp_get_signup_username_value() {
-        $value = '';
-        if ( isset( $_POST['signup_username'] ) )
-            $value = $_POST['signup_username'];
-
-        return apply_filters( 'bp_get_signup_username_value', $value );
-    }
-
-function bp_signup_email_value() {
-    echo bp_get_signup_email_value();
-}
-    function bp_get_signup_email_value() {
-        $value = '';
-        if ( isset( $_POST['signup_email'] ) )
-            $value = $_POST['signup_email'];
-
-        return apply_filters( 'bp_get_signup_email_value', $value );
-    }
-
-function bp_signup_with_blog_value() {
-    echo bp_get_signup_with_blog_value();
-}
-    function bp_get_signup_with_blog_value() {
-        $value = '';
-        if ( isset( $_POST['signup_with_blog'] ) )
-            $value = $_POST['signup_with_blog'];
-
-        return apply_filters( 'bp_get_signup_with_blog_value', $value );
-    }
-
-function bp_signup_blog_url_value() {
-    echo bp_get_signup_blog_url_value();
-}
-    function bp_get_signup_blog_url_value() {
-        $value = '';
-        if ( isset( $_POST['signup_blog_url'] ) )
-            $value = $_POST['signup_blog_url'];
-
-        return apply_filters( 'bp_get_signup_blog_url_value', $value );
-    }
-
-function bp_signup_blog_title_value() {
-    echo bp_get_signup_blog_title_value();
-}
-    function bp_get_signup_blog_title_value() {
-        $value = '';
-        if ( isset( $_POST['signup_blog_title'] ) )
-            $value = $_POST['signup_blog_title'];
-
-        return apply_filters( 'bp_get_signup_blog_title_value', $value );
-    }
-
-function bp_signup_blog_privacy_value() {
-    echo bp_get_signup_blog_privacy_value();
-}
-    function bp_get_signup_blog_privacy_value() {
-        $value = '';
-        if ( isset( $_POST['signup_blog_privacy'] ) )
-            $value = $_POST['signup_blog_privacy'];
-
-        return apply_filters( 'bp_get_signup_blog_privacy_value', $value );
-    }
-
-function bp_signup_avatar_dir_value() {
-    echo bp_get_signup_avatar_dir_value();
-}
-    function bp_get_signup_avatar_dir_value() {
-        global $bp;
-
-        return apply_filters( 'bp_get_signup_avatar_dir_value', $bp->signup->avatar_dir );
-    }
-
-function bp_current_signup_step() {
-    echo bp_get_current_signup_step();
-}
-    function bp_get_current_signup_step() {
-        global $bp;
-
-        return $bp->signup->step;
-    }
-
-function bp_signup_avatar( $args = '' ) {
-    echo bp_get_signup_avatar( $args );
-}
-    function bp_get_signup_avatar( $args = '' ) {
-        global $bp;
-
-        $defaults = array(
-            'size' => BP_AVATAR_FULL_WIDTH,
-            'class' => 'avatar',
-            'alt' => __( 'Your Avatar', 'buddypress' )
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-
-        if ( !empty( $_POST['signup_avatar_dir'] ) ) {
-            $signup_avatar_dir = $_POST['signup_avatar_dir'];
-        } else if ( !empty( $bp->signup->avatar_dir ) ) {
-            $signup_avatar_dir = $bp->signup->avatar_dir;
-        }
-
-        if ( empty( $signup_avatar_dir ) ) {
-            if ( empty( $bp->grav_default->user ) ) {
-                $default_grav = 'wavatar';
-            } else if ( 'mystery' == $bp->grav_default->user ) {
-                $default_grav = apply_filters( 'bp_core_mysteryman_src', BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg' );
-            } else {
-                $default_grav = $bp->grav_default->user;
-            }
-
-            $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
-            $gravatar_img = '<img src="' . $gravatar_url . md5( strtolower( $_POST['signup_email'] ) ) . '?d=' . $default_grav . '&amp;s=' . $size . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
-        } else {
-            $gravatar_img = bp_core_fetch_avatar( array( 'item_id' => $signup_avatar_dir, 'object' => 'signup', 'avatar_dir' => 'avatars/signups', 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) );
-        }
-
-        return apply_filters( 'bp_get_signup_avatar', $gravatar_img );
-    }
-
-function bp_signup_allowed() {
-    echo bp_get_signup_allowed();
-}
-    function bp_get_signup_allowed() {
-        global $bp;
-
-        if ( is_multisite() ) {
-            if ( in_array( $bp->site_options['registration'], array( 'all', 'user' ) ) )
-                return true;
-        } else {
-            if ( (int)get_option( 'users_can_register') )
-                return true;
-        }
-        return false;
-    }
-
 function bp_blog_signup_allowed() {
     echo bp_get_blog_signup_allowed();
@@ -1362 +574 @@
     return apply_filters( 'bp_registration_needs_activation', true );
 }
-
-function bp_mentioned_user_display_name( $user_id_or_username ) {
-    echo bp_get_mentioned_user_display_name( $user_id_or_username );
-}
-    function bp_get_mentioned_user_display_name( $user_id_or_username ) {
-        if ( !$name = bp_core_get_user_displayname( $user_id_or_username ) )
-            $name = __( 'a user' );
-
-        return apply_filters( 'bp_get_mentioned_user_display_name', $name, $user_id_or_username );
-    }
 
 function bp_get_option( $option_name ) {
@@ -1403 +605 @@
 }
 
-
-/*** CUSTOM LOOP TEMPLATE CLASSES *******************/
-
-
-/* Template functions for fetching globals, without querying the DB again
-   also means we dont have to use the $bp variable in the template (looks messy) */
-
-function bp_last_activity( $user_id = false, $echo = true ) {
-    global $bp;
-
-    if ( !$user_id )
-        $user_id = $bp->displayed_user->id;
-
-    $last_activity = bp_core_get_last_activity( get_user_meta( $user_id, 'last_activity', true ), __('active %s ago', 'buddypress') );
-
-    if ( $echo )
-        echo apply_filters( 'bp_last_activity', $last_activity );
-    else
-        return apply_filters( 'bp_last_activity', $last_activity );
-}
-
-function bp_user_has_access() {
-    global $bp;
-
-    if ( is_super_admin() || is_user_logged_in() && $bp->loggedin_user->id == $bp->displayed_user->id )
-        $has_access = true;
-    else
-        $has_access = false;
-
-    return apply_filters( 'bp_user_has_access', $has_access );
-}
-
-function bp_user_firstname() {
-    echo bp_get_user_firstname();
-}
-    function bp_get_user_firstname( $name = false ) {
-        global $bp;
-
-        // Try to get displayed user
-        if ( empty( $name ) )
-            $name = $bp->displayed_user->fullname;
-
-        // Fall back on logged in user
-        if ( empty( $name ) )
-            $name = $bp->loggedin_user->fullname;
-
-        $fullname = (array)explode( ' ', $name );
-
-        return apply_filters( 'bp_get_user_firstname', $fullname[0], $fullname );
-    }
-
-function bp_loggedin_user_link() {
-    echo bp_get_loggedin_user_link();
-}
-    function bp_get_loggedin_user_link() {
-        global $bp;
-
-        return apply_filters( 'bp_get_loggedin_user_link', $bp->loggedin_user->domain );
-    }
-
-/* @todo Deprecate incorrectly named function? */
-function bp_loggedinuser_link() {
-    global $bp;
-
-    if ( $link = bp_core_get_userlink( $bp->loggedin_user->id ) )
-        echo apply_filters( 'bp_loggedin_user_link', $link );
-}
-
-function bp_displayed_user_link() {
-    echo bp_get_displayed_user_link();
-}
-    function bp_get_displayed_user_link() {
-        global $bp;
-
-        return apply_filters( 'bp_get_displayed_user_link', $bp->displayed_user->domain );
-    }
-    function bp_user_link() { bp_displayed_user_link(); } // Deprecated.
-
-function bp_displayed_user_id() {
-    global $bp;
-    return apply_filters( 'bp_displayed_user_id', $bp->displayed_user->id );
-}
-    function bp_current_user_id() { return bp_displayed_user_id(); }
-
-function bp_loggedin_user_id() {
-    global $bp;
-    return apply_filters( 'bp_loggedin_user_id', $bp->loggedin_user->id );
-}
-
-function bp_displayed_user_domain() {
-    global $bp;
-    return apply_filters( 'bp_displayed_user_domain', $bp->displayed_user->domain );
-}
-
-function bp_loggedin_user_domain() {
-    global $bp;
-    return apply_filters( 'bp_loggedin_user_domain', $bp->loggedin_user->domain );
-}
-
-function bp_displayed_user_fullname() {
-    echo bp_get_displayed_user_fullname();
-}
-    function bp_get_displayed_user_fullname() {
-        global $bp;
-
-        return apply_filters( 'bp_displayed_user_fullname', $bp->displayed_user->fullname );
-    }
-    function bp_user_fullname() { echo bp_get_displayed_user_fullname(); }
-
-
-function bp_loggedin_user_fullname() {
-    echo bp_get_loggedin_user_fullname();
-}
-    function bp_get_loggedin_user_fullname() {
-        global $bp;
-        return apply_filters( 'bp_get_loggedin_user_fullname', $bp->loggedin_user->fullname );
-    }
-
-function bp_displayed_user_username() {
-    echo bp_get_displayed_user_username();
-}
-    function bp_get_displayed_user_username() {
-        global $bp;
-        return apply_filters( 'bp_get_displayed_user_username', bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) );
-    }
-
-function bp_loggedin_user_username() {
-    echo bp_get_loggedin_user_username();
-}
-    function bp_get_loggedin_user_username() {
-        global $bp;
-        return apply_filters( 'bp_get_loggedin_user_username', bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login ) );
-    }
+/** Template Classes and _is functions ****************************************/
 
 function bp_current_component() {

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

@@ -389 +389 @@
 }
 
-function bp_forums_total_topic_count_for_user( $user_id = false ) {
+function bp_forums_total_topic_count_for_user( $user_id = 0 ) {
     global $bp;
 

trunk/bp-forums/bp-forums-template.php

@@ -170 +170 @@
      */
     $type = 'newest';
-    $user_id = false;
+    $user_id = 0;
     $forum_id = false;
     $search_terms = false;
@@ -1098 +1098 @@
     }
 
-function bp_forum_topic_count_for_user( $user_id = false ) {
+function bp_forum_topic_count_for_user( $user_id = 0 ) {
     echo bp_get_forum_topic_count_for_user( $user_id );
 }
-    function bp_get_forum_topic_count_for_user( $user_id = false ) {
+    function bp_get_forum_topic_count_for_user( $user_id = 0 ) {
         return apply_filters( 'bp_get_forum_topic_count_for_user', bp_forums_total_topic_count_for_user( $user_id ) );
     }
 
-function bp_forum_topic_count( $user_id = false ) {
+function bp_forum_topic_count( $user_id = 0 ) {
     echo bp_get_forum_topic_count( $user_id );
 }
-    function bp_get_forum_topic_count( $user_id = false ) {
+    function bp_get_forum_topic_count( $user_id = 0 ) {
         return apply_filters( 'bp_get_forum_topic_count', bp_forums_total_topic_count( $user_id ) );
     }

trunk/bp-friends/bp-friends-classes.php

@@ -117 +117 @@
     }
 
-    function total_friend_count( $user_id = false ) {
+    function total_friend_count( $user_id = 0 ) {
         global $wpdb, $bp;
 

trunk/bp-friends/bp-friends-template.php

@@ -266 +266 @@
     }
 
-function bp_get_friend_ids( $user_id = false ) {
+function bp_get_friend_ids( $user_id = 0 ) {
     global $bp;
 

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

@@ -166 +166 @@
     }
 
-    function filter_user_groups( $filter, $user_id = false, $order = false, $limit = null, $page = null ) {
+    function filter_user_groups( $filter, $user_id = 0, $order = false, $limit = null, $page = null ) {
         global $wpdb, $bp;
 
@@ -256 +256 @@
     }
 
-    function get( $type = 'newest', $per_page = null, $page = null, $user_id = false, $search_terms = false, $include = false, $populate_extras = true, $exclude = false, $show_hidden = false ) {
+    function get( $type = 'newest', $per_page = null, $page = null, $user_id = 0, $search_terms = false, $include = false, $populate_extras = true, $exclude = false, $show_hidden = false ) {
         global $wpdb, $bp;
 
@@ -361 +361 @@
     }
 
-    function get_by_most_forum_topics( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true, $exclude = false ) {
+    function get_by_most_forum_topics( $limit = null, $page = null, $user_id = 0, $search_terms = false, $populate_extras = true, $exclude = false ) {
         global $wpdb, $bp, $bbdb;
 
@@ -483 +483 @@
     }
 
-    function get_random( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true, $exclude = false ) {
+    function get_random( $limit = null, $page = null, $user_id = 0, $search_terms = false, $populate_extras = true, $exclude = false ) {
         global $wpdb, $bp;
 
@@ -600 +600 @@
     var $user;
 
-    function bp_groups_member( $user_id = false, $group_id = false, $id = false, $populate = true ) {
+    function bp_groups_member( $user_id = 0, $group_id = false, $id = false, $populate = true ) {
         if ( $user_id && $group_id && !$id ) {
             $this->user_id = $user_id;
@@ -852 +852 @@
     }
 
-    function total_group_count( $user_id = false ) {
+    function total_group_count( $user_id = 0 ) {
         global $bp, $wpdb;
 

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

@@ -2202 +2202 @@
 /*** Group Invitations *********************************************************/
 
-function groups_get_invites_for_user( $user_id = false, $limit = false, $page = false, $exclude = false ) {
+function groups_get_invites_for_user( $user_id = 0, $limit = false, $page = false, $exclude = false ) {
     global $bp;
 
@@ -2445 +2445 @@
 }
 
-function groups_accept_membership_request( $membership_id, $user_id = false, $group_id = false ) {
+function groups_accept_membership_request( $membership_id, $user_id = 0, $group_id = false ) {
     global $bp;
 
@@ -2484 +2484 @@
 }
 
-function groups_reject_membership_request( $membership_id, $user_id = false, $group_id = false ) {
+function groups_reject_membership_request( $membership_id, $user_id = 0, $group_id = false ) {
     if ( !$membership = groups_delete_membership_request( $membership_id, $user_id, $group_id ) )
         return false;
@@ -2497 +2497 @@
 }
 
-function groups_delete_membership_request( $membership_id, $user_id = false, $group_id = false ) {
+function groups_delete_membership_request( $membership_id, $user_id = 0, $group_id = false ) {
     if ( $user_id && $group_id )
         $membership = new BP_Groups_Member( $user_id, $group_id );

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

@@ -895 +895 @@
     }
 
-function bp_group_member_demote_link( $user_id = false ) {
+function bp_group_member_demote_link( $user_id = 0 ) {
     global $members_template;
 
@@ -903 +903 @@
     echo bp_get_group_member_demote_link( $user_id );
 }
-    function bp_get_group_member_demote_link( $user_id = false, $group = false ) {
+    function bp_get_group_member_demote_link( $user_id = 0, $group = false ) {
         global $members_template, $groups_template, $bp;
 
@@ -915 +915 @@
     }
 
-function bp_group_member_ban_link( $user_id = false ) {
+function bp_group_member_ban_link( $user_id = 0 ) {
     global $members_template;
 
@@ -923 +923 @@
     echo bp_get_group_member_ban_link( $user_id );
 }
-    function bp_get_group_member_ban_link( $user_id = false, $group = false ) {
+    function bp_get_group_member_ban_link( $user_id = 0, $group = false ) {
         global $members_template, $groups_template, $bp;
 
@@ -932 +932 @@
     }
 
-function bp_group_member_unban_link( $user_id = false ) {
+function bp_group_member_unban_link( $user_id = 0 ) {
     global $members_template;
 
@@ -940 +940 @@
     echo bp_get_group_member_unban_link( $user_id );
 }
-    function bp_get_group_member_unban_link( $user_id = false, $group = false ) {
+    function bp_get_group_member_unban_link( $user_id = 0, $group = false ) {
         global $members_template, $groups_template;
 
@@ -953 +953 @@
 
 
-function bp_group_member_remove_link( $user_id = false ) {
+function bp_group_member_remove_link( $user_id = 0 ) {
     global $members_template;
 
@@ -961 +961 @@
     echo bp_get_group_member_remove_link( $user_id );
 }
-    function bp_get_group_member_remove_link( $user_id = false, $group = false ) {
+    function bp_get_group_member_remove_link( $user_id = 0, $group = false ) {
         global $members_template, $groups_template;
 
@@ -1352 +1352 @@
     }
 
-function bp_total_group_count_for_user( $user_id = false ) {
+function bp_total_group_count_for_user( $user_id = 0 ) {
     echo bp_get_total_group_count_for_user( $user_id );
 }
-    function bp_get_total_group_count_for_user( $user_id = false ) {
+    function bp_get_total_group_count_for_user( $user_id = 0 ) {
         return apply_filters( 'bp_get_total_group_count_for_user', groups_total_groups_for_user( $user_id ) );
     }
@@ -2375 +2375 @@
  */
 
+/**
+ * Hook group activity feed to <head>
+ *
+ * @since 1.3
+ */
+function bp_groups_activity_feed() {
+    if ( !bp_is_active( 'groups' ) || !bp_is_active( 'activity' ) || !bp_is_group() )
+        return; ?>
+
+    <link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> | <?php bp_current_group_name() ?> | <?php _e( 'Group Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_group_activity_feed_link() ?>" />
+
+<?php
+}
+add_action( 'bp_head', 'bp_groups_activity_feed' );
+
 function bp_group_activity_feed_link() {
     echo bp_get_group_activity_feed_link();

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

@@ -31 +31 @@
         $this->slug      = BP_SETTINGS_SLUG;
         $this->root_slug = isset( $bp->pages->settings->slug ) ? $bp->pages->settings->slug : $this->slug;
+        
+        // Register this in the active components array
+        $bp->active_components[$this->id] = $this->id;
     }
 
@@ -56 +59 @@
         bp_core_new_nav_item( array(
             'name'                    => __( 'Settings', 'buddypress' ),
-            'slug'                    => $bp->settings->slug,
+            'slug'                    => $this->slug,
             'position'                => 100,
             'show_for_displayed_user' => bp_users_can_edit_settings(),
@@ -70 +73 @@
             'slug'            => 'general',
             'parent_url'      => $settings_link,
-            'parent_slug'     => $bp->settings->slug,
+            'parent_slug'     => $this->slug,
             'screen_function' => 'bp_settings_screen_general_settings',
             'position'        => 10,
@@ -81 +84 @@
             'slug'            => 'notifications',
             'parent_url'      => $settings_link,
-            'parent_slug'     => $bp->settings->slug,
+            'parent_slug'     => $this->slug,
             'screen_function' => 'bp_settings_screen_notification_settings',
             'position'        => 20,
@@ -93 +96 @@
                 'slug'            => 'delete-account',
                 'parent_url'      => $settings_link,
-                'parent_slug'     => $bp->settings->slug,
+                'parent_slug'     => $this->slug,
                 'screen_function' => 'bp_settings_screen_delete_account',
                 'position'        => 90,
@@ -101 +104 @@
     }
 }
+// Create the settingss component
 $bp->settings = new BP_Settings_Component();
 
-function bp_users_add_settings_nav() {
-    global $bp;
-
-    // Register this in the active components array
-    $bp->active_components[$bp->settings->slug] = $bp->settings->id;
-
-    do_action( 'bp_core_settings_setup_nav' );
-}
-
 ?>

trunk/bp-users/bp-users-functions.php

@@ -447 +447 @@
  * @uses get_site_option Checks if account deletion is allowed
  */
-function bp_core_delete_account( $user_id = false ) {
+function bp_core_delete_account( $user_id = 0 ) {
     global $bp, $wp_version;
 

trunk/bp-users/bp-users-loader.php

@@ -99 +99 @@
 
         // Users is active
-        $bp->active_components[$this->slug] = $this->id;
+        $bp->active_components[$this->id] = $this->id;
         
         /** Default Profile Component *****************************************/
@@ -135 +135 @@
         bp_core_new_nav_item( array(
             'name'                => __( 'User', 'buddypress' ),
-            'slug'                => $bp->users->slug,
+            'slug'                => $this->slug,
             'position'            => 10,
             'screen_function'     => 'bp_users_screen_my_users',
             'default_subnav_slug' => 'just-me',
-            'item_css_id'         => $bp->users->id )
-        );
+            'item_css_id'         => $this->id
+        ) );
 
         // Stop if there is no user displayed or logged in
@@ -149 +149 @@
         $user_domain   = ( isset( $bp->displayed_user->domain ) )               ? $bp->displayed_user->domain               : $bp->loggedin_user->domain;
         $user_login    = ( isset( $bp->displayed_user->userdata->user_login ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
-        $users_link = $user_domain . $bp->users->slug . '/';
+        $users_link    = $user_domain . $this->slug . '/';
 
         // Add the subnav items to the users nav item if we are using a theme that supports this
@@ -156 +156 @@
             'slug'            => 'just-me',
             'parent_url'      => $users_link,
-            'parent_slug'     => $bp->users->slug,
+            'parent_slug'     => $this->slug,
             'screen_function' => 'bp_users_screen_my_users',
             'position'        => 10
@@ -167 +167 @@
                 'slug'            => BP_FRIENDS_SLUG,
                 'parent_url'      => $users_link,
-                'parent_slug'     => $bp->users->slug,
+                'parent_slug'     => $this->slug,
                 'screen_function' => 'bp_users_screen_friends',
                 'position'        => 20,
@@ -180 +180 @@
                 'slug'            => BP_GROUPS_SLUG,
                 'parent_url'      => $users_link,
-                'parent_slug'     => $bp->users->slug,
+                'parent_slug'     => $this->slug,
                 'screen_function' => 'bp_users_screen_groups',
                 'position'        => 30,
@@ -192 +192 @@
             'slug'            => 'favorites',
             'parent_url'      => $users_link,
-            'parent_slug'     => $bp->users->slug,
+            'parent_slug'     => $this->slug,
             'screen_function' => 'bp_users_screen_favorites',
             'position'        => 40,
@@ -203 +203 @@
             'slug'            => 'mentions',
             'parent_url'      => $users_link,
-            'parent_slug'     => $bp->users->slug,
+            'parent_slug'     => $this->slug,
             'screen_function' => 'bp_users_screen_mentions',
             'position'        => 50,

trunk/bp-users/bp-users-template.php

@@ -1 +1 @@
 <?php
+
+
+/***
+ * Members template loop that will allow you to loop all members or friends of a member
+ * if you pass a user_id.
+ */
+
+class BP_Core_Members_Template {
+    var $current_member = -1;
+    var $member_count;
+    var $members;
+    var $member;
+
+    var $in_the_loop;
+
+    var $pag_page;
+    var $pag_num;
+    var $pag_links;
+    var $total_member_count;
+
+    function bp_core_members_template( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude ) {
+        global $bp;
+
+        $this->pag_page  = !empty( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : (int)$page_number;
+        $this->pag_num   = !empty( $_REQUEST['num'] )   ? intval( $_REQUEST['num'] )   : (int)$per_page;
+        $this->type      = $type;
+
+        if ( !$this->pag_num )
+            $this->pag_num = 1;
+
+        if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] )
+            $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page, $populate_extras, $exclude );
+        else if ( false !== $include )
+            $this->members = BP_Core_User::get_specific_users( $include, $this->pag_num, $this->pag_page, $populate_extras );
+        else
+            $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras, 'exclude' => $exclude ) );
+
+        if ( !$max || $max >= (int)$this->members['total'] )
+            $this->total_member_count = (int)$this->members['total'];
+        else
+            $this->total_member_count = (int)$max;
+
+        $this->members = $this->members['users'];
+
+        if ( $max ) {
+            if ( $max >= count( $this->members ) ) {
+                $this->member_count = count( $this->members );
+            } else {
+                $this->member_count = (int)$max;
+            }
+        } else {
+            $this->member_count = count( $this->members );
+        }
+
+        if ( (int)$this->total_member_count && (int)$this->pag_num ) {
+            $this->pag_links = paginate_links( array(
+                'base'      => add_query_arg( 'upage', '%#%' ),
+                'format'    => '',
+                'total'     => ceil( (int)$this->total_member_count / (int)$this->pag_num ),
+                'current'   => (int) $this->pag_page,
+                'prev_text' => '&larr;',
+                'next_text' => '&rarr;',
+                'mid_size'   => 1
+            ) );
+        }
+    }
+
+    function has_members() {
+        if ( $this->member_count )
+            return true;
+
+        return false;
+    }
+
+    function next_member() {
+        $this->current_member++;
+        $this->member = $this->members[$this->current_member];
+
+        return $this->member;
+    }
+
+    function rewind_members() {
+        $this->current_member = -1;
+        if ( $this->member_count > 0 ) {
+            $this->member = $this->members[0];
+        }
+    }
+
+    function members() {
+        if ( $this->current_member + 1 < $this->member_count ) {
+            return true;
+        } elseif ( $this->current_member + 1 == $this->member_count ) {
+            do_action('member_loop_end');
+            // Do some cleaning up after the loop
+            $this->rewind_members();
+        }
+
+        $this->in_the_loop = false;
+        return false;
+    }
+
+    function the_member() {
+        global $member, $bp;
+
+        $this->in_the_loop = true;
+        $this->member = $this->next_member();
+
+        if ( 0 == $this->current_member ) // loop has just started
+            do_action('member_loop_start');
+    }
+}
+
+function bp_rewind_members() {
+    global $members_template;
+
+    return $members_template->rewind_members();
+}
+
+function bp_has_members( $args = '' ) {
+    global $bp, $members_template;
+
+    /***
+     * Set the defaults based on the current page. Any of these will be overridden
+     * if arguments are directly passed into the loop. Custom plugins should always
+     * pass their parameters directly to the loop.
+     */
+    $type = 'active';
+    $user_id = 0;
+    $page = 1;
+    $search_terms = null;
+
+    // User filtering
+    if ( !empty( $bp->displayed_user->id ) )
+        $user_id = $bp->displayed_user->id;
+
+    // type: active ( default ) | random | newest | popular | online | alphabetical
+    $defaults = array(
+        'type' => $type,
+        'page' => $page,
+        'per_page' => 20,
+        'max' => false,
+
+        'include' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to only show these users
+        'exclude' => false, // Pass a user_id or a list (comma-separated or array) of user_ids to exclude these users
+
+        'user_id' => $user_id, // Pass a user_id to only show friends of this user
+        'search_terms' => $search_terms, // Pass search_terms to filter users by their profile data
+
+        'populate_extras' => true // Fetch usermeta? Friend count, last active etc.
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r );
+
+    // Pass a filter if ?s= is set.
+    if ( is_null( $search_terms ) ) {
+        if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
+            $search_terms = $_REQUEST['s'];
+        else
+            $search_terms = false;
+    }
+
+    if ( $max ) {
+        if ( $per_page > $max )
+            $per_page = $max;
+    }
+
+    // Make sure we return no members if we looking at friendship requests and there are none.
+    if ( empty( $include ) && bp_is_current_component( $bp->friends->slug ) && 'requests' == $bp->current_action )
+        return false;
+
+    $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras, $exclude );
+    return apply_filters( 'bp_has_members', $members_template->has_members(), $members_template );
+}
+
+function bp_the_member() {
+    global $members_template;
+    return $members_template->the_member();
+}
+
+function bp_members() {
+    global $members_template;
+    return $members_template->members();
+}
+
+function bp_members_pagination_count() {
+    echo bp_get_members_pagination_count();
+}
+    function bp_get_members_pagination_count() {
+        global $bp, $members_template;
+
+        $start_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
+        $from_num = bp_core_number_format( $start_num );
+        $to_num = bp_core_number_format( ( $start_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $start_num + ( $members_template->pag_num - 1 ) );
+        $total = bp_core_number_format( $members_template->total_member_count );
+
+        if ( 'active' == $members_template->type )
+            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s active members)', 'buddypress' ), $from_num, $to_num, $total );
+        else if ( 'popular' == $members_template->type )
+            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members with friends)', 'buddypress' ), $from_num, $to_num, $total );
+        else if ( 'online' == $members_template->type )
+            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members online)', 'buddypress' ), $from_num, $to_num, $total );
+        else
+            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total );
+
+        return apply_filters( 'bp_members_pagination_count', $pag . '<span class="ajax-loader"></span>' );
+    }
+
+function bp_members_pagination_links() {
+    echo bp_get_members_pagination_links();
+}
+    function bp_get_members_pagination_links() {
+        global $members_template;
+
+        return apply_filters( 'bp_get_members_pagination_links', $members_template->pag_links );
+    }
+
+/**
+ * bp_member_user_id()
+ *
+ * Echo id from bp_get_member_user_id()
+ *
+ * @uses bp_get_member_user_id()
+ */
+function bp_member_user_id() {
+    echo bp_get_member_user_id();
+}
+    /**
+     * bp_get_member_user_id()
+     *
+     * Get the id of the user in a members loop
+     *
+     * @global object $members_template
+     * @return string Members id
+     */
+    function bp_get_member_user_id() {
+        global $members_template;
+
+        return apply_filters( 'bp_get_member_user_id', $members_template->member->id );
+    }
+
+/**
+ * bp_member_user_nicename()
+ *
+ * Echo nicename from bp_get_member_user_nicename()
+ *
+ * @uses bp_get_member_user_nicename()
+ */
+function bp_member_user_nicename() {
+    echo bp_get_member_user_nicename();
+}
+    /**
+     * bp_get_member_user_nicename()
+     *
+     * Get the nicename of the user in a members loop
+     *
+     * @global object $members_template
+     * @return string Members nicename
+     */
+    function bp_get_member_user_nicename() {
+        global $members_template;
+        return apply_filters( 'bp_get_member_user_nicename', $members_template->member->user_nicename );
+    }
+
+/**
+ * bp_member_user_login()
+ *
+ * Echo login from bp_get_member_user_login()
+ *
+ * @uses bp_get_member_user_login()
+ */
+function bp_member_user_login() {
+    echo bp_get_member_user_login();
+}
+    /**
+     * bp_get_member_user_login()
+     *
+     * Get the login of the user in a members loop
+     *
+     * @global object $members_template
+     * @return string Members login
+     */
+    function bp_get_member_user_login() {
+        global $members_template;
+        return apply_filters( 'bp_get_member_user_login', $members_template->member->user_login );
+    }
+
+/**
+ * bp_member_user_email()
+ *
+ * Echo email address from bp_get_member_user_email()
+ *
+ * @uses bp_get_member_user_email()
+ */
+function bp_member_user_email() {
+    echo bp_get_member_user_email();
+}
+    /**
+     * bp_get_member_user_email()
+     *
+     * Get the email address of the user in a members loop
+     *
+     * @global object $members_template
+     * @return string Members email address
+     */
+    function bp_get_member_user_email() {
+        global $members_template;
+        return apply_filters( 'bp_get_member_user_email', $members_template->member->user_email );
+    }
+
+function bp_member_is_loggedin_user() {
+    global $bp, $members_template;
+    return apply_filters( 'bp_member_is_loggedin_user', $bp->loggedin_user->id == $members_template->member->id ? true : false );
+}
+
+function bp_member_avatar( $args = '' ) {
+    echo apply_filters( 'bp_member_avatar', bp_get_member_avatar( $args ) );
+}
+    function bp_get_member_avatar( $args = '' ) {
+        global $bp, $members_template;
+
+        $defaults = array(
+            'type' => 'thumb',
+            'width' => false,
+            'height' => false,
+            'class' => 'avatar',
+            'id' => false,
+            'alt' => __( 'Profile picture of %s', 'buddypress' )
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+
+        return apply_filters( 'bp_get_member_avatar', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->id, 'type' => $type, 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $members_template->member->user_email ) ) );
+    }
+
+function bp_member_permalink() {
+    echo bp_get_member_permalink();
+}
+    function bp_get_member_permalink() {
+        global $members_template;
+
+        return apply_filters( 'bp_get_member_permalink', bp_core_get_user_domain( $members_template->member->id, $members_template->member->user_nicename, $members_template->member->user_login ) );
+    }
+    function bp_member_link() { echo bp_get_member_permalink(); }
+    function bp_get_member_link() { return bp_get_member_permalink(); }
+
+function bp_member_name() {
+    echo apply_filters( 'bp_member_name', bp_get_member_name() );
+}
+    function bp_get_member_name() {
+        global $members_template;
+
+        if ( empty($members_template->member->fullname) )
+            $members_template->member->fullname = $members_template->member->display_name;
+
+        return apply_filters( 'bp_get_member_name', $members_template->member->fullname );
+    }
+    add_filter( 'bp_get_member_name', 'wp_filter_kses' );
+    add_filter( 'bp_get_member_name', 'stripslashes' );
+    add_filter( 'bp_get_member_name', 'strip_tags' );
+
+function bp_member_last_active() {
+    echo bp_get_member_last_active();
+}
+    function bp_get_member_last_active() {
+        global $members_template;
+
+        $last_activity = bp_core_get_last_activity( $members_template->member->last_activity, __( 'active %s ago', 'buddypress' ) );
+
+        return apply_filters( 'bp_member_last_active', $last_activity );
+    }
+
+function bp_member_latest_update( $args = '' ) {
+    echo bp_get_member_latest_update( $args );
+}
+    function bp_get_member_latest_update( $args = '' ) {
+        global $members_template, $bp;
+
+        $defaults = array(
+            'length' => 70
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+
+        if ( !isset( $members_template->member->latest_update ) || !$update = maybe_unserialize( $members_template->member->latest_update ) )
+            return false;
+
+        $update_content = apply_filters( 'bp_get_activity_latest_update', strip_tags( bp_create_excerpt( $update['content'], $length ) ) );
+
+        if ( !empty( $update['id'] ) )
+            $update_content .= ' &middot; <a href="' . $bp->root_domain . '/' . $bp->activity->root_slug . '/p/' . $update['id'] . '">' . __( 'View', 'buddypress' ) . '</a>';
+
+        return apply_filters( 'bp_get_member_latest_update', $update_content );
+    }
+
+function bp_member_profile_data( $args = '' ) {
+    echo bp_get_member_profile_data( $args );
+}
+    function bp_get_member_profile_data( $args = '' ) {
+        global $members_template;
+
+        if ( !bp_is_active( 'xprofile' ) )
+            return false;
+
+        $defaults = array(
+            'field' => false, // Field name
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+
+        // Populate the user if it hasn't been already.
+        if ( empty( $members_template->member->profile_data ) && method_exists( 'BP_XProfile_ProfileData', 'get_all_for_user' ) )
+            $members_template->member->profile_data = BP_XProfile_ProfileData::get_all_for_user( $members_template->member->id );
+
+        $data = xprofile_format_profile_field( $members_template->member->profile_data[$field]['field_type'], $members_template->member->profile_data[$field]['field_data'] );
+
+        return apply_filters( 'bp_get_member_profile_data', $data );
+    }
+
+function bp_member_registered() {
+    echo bp_get_member_registered();
+}
+    function bp_get_member_registered() {
+        global $members_template;
+
+        $registered = esc_attr( bp_core_get_last_activity( $members_template->member->user_registered, __( 'registered %s ago', 'buddypress' ) ) );
+
+        return apply_filters( 'bp_member_last_active', $registered );
+    }
+
+function bp_member_random_profile_data() {
+    global $members_template;
+
+    if ( function_exists( 'xprofile_get_random_profile_data' ) ) { ?>
+        <?php $random_data = xprofile_get_random_profile_data( $members_template->member->id, true ); ?>
+            <strong><?php echo wp_filter_kses( $random_data[0]->name ) ?></strong>
+            <?php echo wp_filter_kses( $random_data[0]->value ) ?>
+    <?php }
+}
+
+function bp_member_hidden_fields() {
+    if ( isset( $_REQUEST['s'] ) )
+        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['s'] ) . '" name="search_terms" />';
+
+    if ( isset( $_REQUEST['letter'] ) )
+        echo '<input type="hidden" id="selected_letter" value="' . esc_attr( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+
+    if ( isset( $_REQUEST['members_search'] ) )
+        echo '<input type="hidden" id="search_terms" value="' . esc_attr( $_REQUEST['members_search'] ) . '" name="search_terms" />';
+}
+
+function bp_directory_members_search_form() {
+    global $bp;
+
+    $default_search_value = bp_get_search_default_text();
+    $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value; ?>
+
+    <form action="" method="get" id="search-members-form">
+        <label><input type="text" name="s" id="members_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
+        <input type="submit" id="members_search_submit" name="members_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+    </form>
+
+<?php
+}
+
+function bp_total_site_member_count() {
+    echo bp_get_total_site_member_count();
+}
+    function bp_get_total_site_member_count() {
+        return apply_filters( 'bp_get_total_site_member_count', bp_core_number_format( bp_core_get_total_member_count() ) );
+    }
+
+
+/** Navigation and other misc template tags **/
+
+/**
+ * bp_get_nav()
+ * TEMPLATE TAG
+ *
+ * Uses the $bp->bp_nav global to render out the navigation within a BuddyPress install.
+ * Each component adds to this navigation array within its own [component_name]_setup_nav() function.
+ *
+ * This navigation array is the top level navigation, so it contains items such as:
+ *      [Blog, Profile, Messages, Groups, Friends] ...
+ *
+ * The function will also analyze the current component the user is in, to determine whether
+ * or not to highlight a particular nav item.
+ *
+ * @package BuddyPress Core
+ * @todo Move to a back-compat file?
+ * @deprecated Does not seem to be called anywhere in the core
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ */
+function bp_get_loggedin_user_nav() {
+    global $bp, $current_blog;
+
+    // Loop through each navigation item
+    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_is_directory() && $bp->active_components[$bp->current_component] == $nav_item['css_id'] )
+            $selected = ' class="current selected"';
+        else
+            $selected = '';
+
+        /* If we are viewing another person (current_userid does not equal loggedin_user->id)
+           then check to see if the two users are friends. if they are, add a highlight CSS class
+           to the friends nav item if it exists. */
+        if ( !bp_is_my_profile() && $bp->displayed_user->id ) {
+            $selected = '';
+
+            if ( bp_is_active( 'friends' ) ) {
+                if ( $nav_item['css_id'] == $bp->friends->id ) {
+                    if ( friends_check_friendship( $bp->loggedin_user->id, $bp->displayed_user->id ) )
+                        $selected = ' class="current selected"';
+                }
+            }
+        }
+
+        // echo out the final list item
+        echo apply_filters( 'bp_get_loggedin_user_nav_' . $nav_item['css_id'], '<li id="li-nav-' . $nav_item['css_id'] . '" ' . $selected . '><a id="my-' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a></li>', &$nav_item );
+    }
+
+    // Always add a log out list item to the end of the navigation
+    if ( function_exists( 'wp_logout_url' ) )
+        $logout_link = '<li><a id="wp-logout" href="' .  wp_logout_url( $bp->root_domain ) . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
+    else
+        $logout_link = '<li><a id="wp-logout" href="' . site_url() . '/wp-login.php?action=logout&amp;redirect_to=' . $bp->root_domain . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
+
+    echo apply_filters( 'bp_logout_nav_link', $logout_link );
+}
+
+/**
+ * Uses the $bp->bp_nav global to render out the user navigation when viewing another user other than
+ * yourself.
+ *
+ * @package BuddyPress Core
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ */
+function bp_get_displayed_user_nav() {
+    global $bp;
+
+    foreach ( (array)$bp->bp_nav as $user_nav_item ) {
+        if ( !$user_nav_item['show_for_displayed_user'] && !bp_is_my_profile() )
+            continue;
+
+        if ( $bp->current_component == $user_nav_item['slug'] )
+            $selected = ' class="current selected"';
+        else
+            $selected = '';
+
+        if ( $bp->loggedin_user->domain )
+            $link = str_replace( $bp->loggedin_user->domain, $bp->displayed_user->domain, $user_nav_item['link'] );
+        else
+            $link = $bp->displayed_user->domain . $user_nav_item['link'];
+
+        echo apply_filters( 'bp_get_displayed_user_nav_' . $user_nav_item['css_id'], '<li id="' . $user_nav_item['css_id'] . '-personal-li" ' . $selected . '><a id="user-' . $user_nav_item['css_id'] . '" href="' . $link . '">' . $user_nav_item['name'] . '</a></li>', &$user_nav_item );
+    }
+}
+
+/** Avatars *******************************************************************/
+
+function bp_loggedin_user_avatar( $args = '' ) {
+    echo bp_get_loggedin_user_avatar( $args );
+}
+    function bp_get_loggedin_user_avatar( $args = '' ) {
+        global $bp;
+
+        $defaults = array(
+            'type'   => 'thumb',
+            'width'  => false,
+            'height' => false,
+            'html'   => true,
+            'alt'    => __( 'Profile picture of %s', 'buddypress' )
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+
+        return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->loggedin_user->id, 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
+    }
+
+function bp_displayed_user_avatar( $args = '' ) {
+    echo bp_get_displayed_user_avatar( $args );
+}
+    function bp_get_displayed_user_avatar( $args = '' ) {
+        global $bp;
+
+        $defaults = array(
+            'type'   => 'thumb',
+            'width'  => false,
+            'height' => false,
+            'html'   => true,
+            'alt'    => __( 'Profile picture of %s', 'buddypress' )
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+
+        return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
+    }
 
 function bp_displayed_user_email() {
@@ -16 +619 @@
     }
 
+function bp_last_activity( $user_id = 0 ) {
+    echo apply_filters( 'bp_last_activity', bp_get_last_activity( $user_id ) );
+}
+    function bp_get_last_activity( $user_id = 0 ) {
+        global $bp;
+
+        if ( empty( $user_id ) )
+            $user_id = $bp->displayed_user->id;
+
+        $last_activity = bp_core_get_last_activity( get_user_meta( $user_id, 'last_activity', true ), __('active %s ago', 'buddypress') );
+
+        return apply_filters( 'bp_get_last_activity', $last_activity );
+    }   
+
+function bp_user_has_access() {
+    global $bp;
+
+    if ( is_super_admin() || is_user_logged_in() && $bp->loggedin_user->id == $bp->displayed_user->id )
+        $has_access = true;
+    else
+        $has_access = false;
+
+    return apply_filters( 'bp_user_has_access', $has_access );
+}
+
+function bp_user_firstname() {
+    echo bp_get_user_firstname();
+}
+    function bp_get_user_firstname( $name = false ) {
+        global $bp;
+
+        // Try to get displayed user
+        if ( empty( $name ) )
+            $name = $bp->displayed_user->fullname;
+
+        // Fall back on logged in user
+        if ( empty( $name ) )
+            $name = $bp->loggedin_user->fullname;
+
+        $fullname = (array)explode( ' ', $name );
+
+        return apply_filters( 'bp_get_user_firstname', $fullname[0], $fullname );
+    }
+
+function bp_loggedin_user_link() {
+    echo bp_get_loggedin_user_link();
+}
+    function bp_get_loggedin_user_link() {
+        global $bp;
+
+        return apply_filters( 'bp_get_loggedin_user_link', $bp->loggedin_user->domain );
+    }
+
+/* @todo Deprecate incorrectly named function? */
+function bp_loggedinuser_link() {
+    global $bp;
+
+    if ( $link = bp_core_get_userlink( $bp->loggedin_user->id ) )
+        echo apply_filters( 'bp_loggedin_user_link', $link );
+}
+
+function bp_displayed_user_link() {
+    echo bp_get_displayed_user_link();
+}
+    function bp_get_displayed_user_link() {
+        global $bp;
+
+        return apply_filters( 'bp_get_displayed_user_link', $bp->displayed_user->domain );
+    }
+    function bp_user_link() { bp_displayed_user_link(); } // Deprecated.
+
+function bp_displayed_user_id() {
+    global $bp;
+    return apply_filters( 'bp_displayed_user_id', $bp->displayed_user->id );
+}
+    function bp_current_user_id() { return bp_displayed_user_id(); }
+
+function bp_loggedin_user_id() {
+    global $bp;
+    return apply_filters( 'bp_loggedin_user_id', $bp->loggedin_user->id );
+}
+
+function bp_displayed_user_domain() {
+    global $bp;
+    return apply_filters( 'bp_displayed_user_domain', $bp->displayed_user->domain );
+}
+
+function bp_loggedin_user_domain() {
+    global $bp;
+    return apply_filters( 'bp_loggedin_user_domain', $bp->loggedin_user->domain );
+}
+
+function bp_displayed_user_fullname() {
+    echo bp_get_displayed_user_fullname();
+}
+    function bp_get_displayed_user_fullname() {
+        global $bp;
+
+        return apply_filters( 'bp_displayed_user_fullname', $bp->displayed_user->fullname );
+    }
+    function bp_user_fullname() { echo bp_get_displayed_user_fullname(); }
+
+
+function bp_loggedin_user_fullname() {
+    echo bp_get_loggedin_user_fullname();
+}
+    function bp_get_loggedin_user_fullname() {
+        global $bp;
+        return apply_filters( 'bp_get_loggedin_user_fullname', $bp->loggedin_user->fullname );
+    }
+
+function bp_displayed_user_username() {
+    echo bp_get_displayed_user_username();
+}
+    function bp_get_displayed_user_username() {
+        global $bp;
+        return apply_filters( 'bp_get_displayed_user_username', bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) );
+    }
+
+function bp_loggedin_user_username() {
+    echo bp_get_loggedin_user_username();
+}
+    function bp_get_loggedin_user_username() {
+        global $bp;
+        return apply_filters( 'bp_get_loggedin_user_username', bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login ) );
+    }
+
+/** Signup Form ***************************************************************/
+
+function bp_has_custom_signup_page() {
+    if ( locate_template( array( 'register.php' ), false ) || locate_template( array( '/registration/register.php' ), false ) )
+        return true;
+
+    return false;
+}
+
+function bp_signup_page() {
+    echo bp_get_signup_page();
+}
+    function bp_get_signup_page() {
+        global $bp;
+
+        if ( bp_has_custom_signup_page() )
+            $page = $bp->root_domain . '/' . BP_REGISTER_SLUG;
+        else
+            $page = $bp->root_domain . '/wp-signup.php';
+
+        return apply_filters( 'bp_get_signup_page', $page );
+    }
+
+function bp_has_custom_activation_page() {
+    if ( locate_template( array( 'activate.php' ), false ) || locate_template( array( '/registration/activate.php' ), false ) )
+        return true;
+
+    return false;
+}
+
+function bp_activation_page() {
+    echo bp_get_activation_page();
+}
+    function bp_get_activation_page() {
+        global $bp;
+
+        if ( bp_has_custom_activation_page() )
+            $page = trailingslashit( $bp->root_domain ) . BP_ACTIVATION_SLUG;
+        else
+            $page = trailingslashit( $bp->root_domain ) . 'wp-activate.php';
+
+        return apply_filters( 'bp_get_activation_page', $page );
+    }
+
+function bp_signup_username_value() {
+    echo bp_get_signup_username_value();
+}
+    function bp_get_signup_username_value() {
+        $value = '';
+        if ( isset( $_POST['signup_username'] ) )
+            $value = $_POST['signup_username'];
+
+        return apply_filters( 'bp_get_signup_username_value', $value );
+    }
+
+function bp_signup_email_value() {
+    echo bp_get_signup_email_value();
+}
+    function bp_get_signup_email_value() {
+        $value = '';
+        if ( isset( $_POST['signup_email'] ) )
+            $value = $_POST['signup_email'];
+
+        return apply_filters( 'bp_get_signup_email_value', $value );
+    }
+
+function bp_signup_with_blog_value() {
+    echo bp_get_signup_with_blog_value();
+}
+    function bp_get_signup_with_blog_value() {
+        $value = '';
+        if ( isset( $_POST['signup_with_blog'] ) )
+            $value = $_POST['signup_with_blog'];
+
+        return apply_filters( 'bp_get_signup_with_blog_value', $value );
+    }
+
+function bp_signup_blog_url_value() {
+    echo bp_get_signup_blog_url_value();
+}
+    function bp_get_signup_blog_url_value() {
+        $value = '';
+        if ( isset( $_POST['signup_blog_url'] ) )
+            $value = $_POST['signup_blog_url'];
+
+        return apply_filters( 'bp_get_signup_blog_url_value', $value );
+    }
+
+function bp_signup_blog_title_value() {
+    echo bp_get_signup_blog_title_value();
+}
+    function bp_get_signup_blog_title_value() {
+        $value = '';
+        if ( isset( $_POST['signup_blog_title'] ) )
+            $value = $_POST['signup_blog_title'];
+
+        return apply_filters( 'bp_get_signup_blog_title_value', $value );
+    }
+
+function bp_signup_blog_privacy_value() {
+    echo bp_get_signup_blog_privacy_value();
+}
+    function bp_get_signup_blog_privacy_value() {
+        $value = '';
+        if ( isset( $_POST['signup_blog_privacy'] ) )
+            $value = $_POST['signup_blog_privacy'];
+
+        return apply_filters( 'bp_get_signup_blog_privacy_value', $value );
+    }
+
+function bp_signup_avatar_dir_value() {
+    echo bp_get_signup_avatar_dir_value();
+}
+    function bp_get_signup_avatar_dir_value() {
+        global $bp;
+
+        return apply_filters( 'bp_get_signup_avatar_dir_value', $bp->signup->avatar_dir );
+    }
+
+function bp_current_signup_step() {
+    echo bp_get_current_signup_step();
+}
+    function bp_get_current_signup_step() {
+        global $bp;
+
+        return $bp->signup->step;
+    }
+
+function bp_signup_avatar( $args = '' ) {
+    echo bp_get_signup_avatar( $args );
+}
+    function bp_get_signup_avatar( $args = '' ) {
+        global $bp;
+
+        $defaults = array(
+            'size' => BP_AVATAR_FULL_WIDTH,
+            'class' => 'avatar',
+            'alt' => __( 'Your Avatar', 'buddypress' )
+        );
+
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+
+        if ( !empty( $_POST['signup_avatar_dir'] ) ) {
+            $signup_avatar_dir = $_POST['signup_avatar_dir'];
+        } else if ( !empty( $bp->signup->avatar_dir ) ) {
+            $signup_avatar_dir = $bp->signup->avatar_dir;
+        }
+
+        if ( empty( $signup_avatar_dir ) ) {
+            if ( empty( $bp->grav_default->user ) ) {
+                $default_grav = 'wavatar';
+            } else if ( 'mystery' == $bp->grav_default->user ) {
+                $default_grav = apply_filters( 'bp_core_mysteryman_src', BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg' );
+            } else {
+                $default_grav = $bp->grav_default->user;
+            }
+
+            $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
+            $gravatar_img = '<img src="' . $gravatar_url . md5( strtolower( $_POST['signup_email'] ) ) . '?d=' . $default_grav . '&amp;s=' . $size . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
+        } else {
+            $gravatar_img = bp_core_fetch_avatar( array( 'item_id' => $signup_avatar_dir, 'object' => 'signup', 'avatar_dir' => 'avatars/signups', 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) );
+        }
+
+        return apply_filters( 'bp_get_signup_avatar', $gravatar_img );
+    }
+
+function bp_signup_allowed() {
+    echo bp_get_signup_allowed();
+}
+    function bp_get_signup_allowed() {
+        global $bp;
+
+        if ( is_multisite() ) {
+            if ( in_array( $bp->site_options['registration'], array( 'all', 'user' ) ) )
+                return true;
+        } else {
+            if ( (int)get_option( 'users_can_register') )
+                return true;
+        }
+        return false;
+    }
+
+/**
+ * Hook member activity feed to <head>
+ *
+ * @since 1.3
+ */
+function bp_users_activity_feed() {
+    if ( !bp_is_active( 'activity' ) || !bp_is_member() )
+        return; ?>
+
+    <link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> | <?php bp_displayed_user_fullname() ?> | <?php _e( 'Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_member_activity_feed_link() ?>" />
+
+<?php
+}
+add_action( 'bp_head', 'bp_users_activity_feed' );
+
 ?>

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -957 +957 @@
     }
 
-    function get_fullname( $user_id = false ) {
+    function get_fullname( $user_id = 0 ) {
         global $bp;