Changeset 2168

trunk/bp-activity.php

-                      r2158
+                      r2168
 require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-classes.php' );
 require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-templatetags.php' );
-require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-widgets.php' );
 require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-filters.php' );
-/* Include deprecated functions if settings allow */
-if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-    require ( BP_PLUGIN_DIR . '/bp-activity/deprecated/bp-activity-deprecated.php' );
 function bp_activity_install() {
 …
 function bp_activity_screen_my_activity() {
     do_action( 'bp_activity_screen_my_activity' );
     bp_core_load_template( apply_filters( 'bp_activity_template_my_activity', 'activity/just-me' ) );
+    bp_core_load_template( apply_filters( 'bp_activity_template_my_activity', 'members/single/activity' ) );
+}
 …
+    }
     bp_core_load_template( apply_filters( 'bp_activity_template_profile_activity_permalink', 'activity/single' ) );
+    bp_core_load_template( apply_filters( 'bp_activity_template_profile_activity_permalink', 'members/single/activity/permalink' ) );
+}
 /* This screen is not attached to a nav item, so we need to add an action for it. */
 …
  */
 function bp_activity_get_sitewide( $args = '' ) {
+function bp_activity_get( $args = '' ) {
     $defaults = array(
         'max' => false, // Maximum number of results to return
 …
         /**
          * Pass filters as an array:
+         * Pass filters as an array -- all filter items can be multiple values comma separated:
          * array(
          *  'user_id' => false, // user_id to filter on
 …
     extract( $r, EXTR_SKIP );
+    return apply_filters( 'bp_activity_get_sitewide', BP_Activity_Activity::get_sitewide_activity( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden ), &$r );
+}
+function bp_activity_get_for_user( $args = '' ) {
+    global $bp;
+    $defaults = array(
+        'user_id' => $bp->displayed_user->id,
+        'max' => false, // Maximum number of results to return
+        'page' => 1, // page 1 without a per_page will result in no pagination.
+        'per_page' => false, // results per page
+        'sort' => 'DESC', // sort ASC or DESC
+        'display_comments' => 'stream', // false for no comments. 'stream' for within stream display, 'threaded' for below each activity item
+        'search_terms' => false, // Pass search terms as a string
+        'show_hidden' => false, // Show activity items that are hidden site-wide?
+        /* See bp_activity_get_sitewide() for filters */
+        'filter' => array()
+    );
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    return apply_filters( 'bp_activity_get_for_user', BP_Activity_Activity::get_activity_for_user( $user_id, $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden ), &$r );
+}
+function bp_activity_get_friends_activity( $user_id, $max = 30, $max_items_per_friend = false, $pag_num = false, $pag_page = false, $filter = false ) {
+    return apply_filters( 'bp_activity_get_friends_activity', BP_Activity_Activity::get_activity_for_friends( $user_id, $max_items, $max_items_per_friend, $pag_num, $pag_page, $filter ), $user_id, $max_items, $max_items_per_friend, $pag_num, $pag_page, $filter );
+    return apply_filters( 'bp_activity_get', BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden ), &$r );
+}
 …
+}
+/**
+ * bp_activity_filter_template_paths()
+ *
+ * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
+ * older than 1.2.
+ *
+ * @package BuddyPress Core
+ */
+function bp_activity_filter_template_paths() {
+    if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+        return false;
+    add_filter( 'bp_activity_template_my_activity', create_function( '', 'return "activity/just-me";' ) );
+    add_filter( 'bp_activity_template_friends_activity', create_function( '', 'return "activity/my-friends";' ) );
+    add_filter( 'bp_activity_template_profile_activity_permalink', create_function( '', 'return "activity/single";' ) );
+    /* Activity widget should only be available to older themes since the new default has it all in the template */
+    require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-widgets.php' );
+}
+add_action( 'widgets_init', 'bp_activity_filter_template_paths' );
 function bp_activity_remove_data( $user_id ) {
     // Clear the user's activity from the sitewide stream and clear their activity tables
 …
 add_action( 'make_spam_user', 'bp_activity_remove_data' );
-/* Ordering function - don't call this directly */
-function bp_activity_order_by_date( $a, $b ) {
-    return apply_filters( 'bp_activity_order_by_date', strcasecmp( $b['date_recorded'], $a['date_recorded'] ) );
+}
 ?>

trunk/bp-activity/bp-activity-classes.php

-                      r2158
+                      r2168
+    }
+    function get_activity_for_user( $user_id, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false ) {
+        global $wpdb, $bp;
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $max )
+            $max_sql = $wpdb->prepare( "LIMIT %d", $max );
+        /* Searching */
+        if ( $search_terms ) {
+            $search_terms = $wpdb->escape( $search_terms );
+            $search_sql = "AND content LIKE '%%" . like_escape( $search_terms ) . "%%'";
+        }
+        /* Filtering */
+        if ( $filter ) {
+            unset($filter['user_id']); // Unset duplicate user_id filter - TODO: merge all to sitewide.
+            $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
+        }
+        /* Sorting */
+        if ( $sort != 'ASC' && $sort != 'DESC' )
+            $sort = 'DESC';
+        /* Hide Hidden Items? */
+        if ( !$show_hidden )
+            $hidden_sql = "AND hide_sitewide = 0";
+        /* Alter the query based on whether we want to show activity item comments in the stream like normal comments or threaded below the activity */
+        if ( !$display_comments || 'threaded' == $display_comments ) {
+            if ( $per_page && $page && $max )
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$pag_sql}", $user_id ) );
+            else
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$pag_sql} {$max_sql}", $user_id ) );
+            $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$max_sql}", $user_id ) );
+            if ( $activities && $display_comments )
+                $activities = BP_Activity_Activity::append_comments( &$activities );
+        } else {
+            if ( $per_page && $page && $max )
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} ORDER BY date_recorded {$sort} {$pag_sql}", $user_id ) );
+            else
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} ORDER BY date_recorded {$sort} {$pag_sql} {$max_sql}", $user_id ) );
+            $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} ORDER BY date_recorded {$sort} {$max_sql}", $user_id ) );
+            if ( $activities )
+                $activities = BP_Activity_Activity::append_comments( &$activities );
+        }
+        return array( 'activities' => $activities, 'total' => (int)$total_activities );
+    }
+    function get_activity_for_friends( $user_id, $max_items, $max_items_per_friend, $limit, $page, $filter ) {
+        global $wpdb, $bp;
+        // TODO: Max items per friend not yet implemented.
+        if ( !function_exists('friends_get_friend_user_ids') )
+            return false;
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $max_items )
+            $max_sql = $wpdb->prepare( "LIMIT %d", $max_items );
+        /* Sort out filtering */
+        if ( $filter )
+            $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
+        $friend_ids = friends_get_friend_user_ids( $user_id );
+        if ( !$friend_ids )
+            return false;
+        $friend_ids = $wpdb->escape( implode( ',', $friend_ids ) );
+        if ( $limit && $page && $max_items )
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT id, user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql"  ) );
+        else
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT id, user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql" ) );
+        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT user_id) FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $max_sql" ) );
+        return array( 'activities' => $activities, 'total' => (int)$total_activities );
+    }
+    function get_sitewide_activity( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false ) {
+    function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false ) {
         global $wpdb, $bp;
 …
         if ( !$display_comments || 'threaded' == $display_comments ) {
             $where_conditions[] = "component_action != 'activity_comment'";
+            $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
+            if ( $per_page && $page && $max )
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY date_recorded {$sort} {$pag_sql}" ) );
+            else
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY date_recorded {$sort} {$pag_sql} {$max_sql}" ) );
+            $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} {$where_sql} ORDER BY date_recorded {$sort} {$max_sql}" ) );
+            if ( $activities && $display_comments )
+                $activities = BP_Activity_Activity::append_comments( &$activities );
+        } else {
+            /***
+             * If we are filtering, this is going to stop activity comments showing in the stream,
+             * we will need to do things slightly differently.
+             */
+            if ( !empty( $where_conditions ) )
+                $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
+             if ( !empty( $filter_sql ) ) {
+                $all_activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY id {$sort}" ) );
+                foreach ( (array)$all_activities as $activity ) {
+                    $tmp_activities[$activity->id] = $activity;
+                    $a_ids[] = $activity->id;
+                }
+                $activity_ids = $wpdb->escape( implode( ',', $a_ids ) );
+                /* Fetch the comments for the activity items */
+                $search_sql = $where_conditions['search_sql'];
+                $all_comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE item_id IN ({$activity_ids}) {$search_sql} ORDER BY id {$sort}" ) );
+                foreach ( (array)$all_comments as $comment ) {
+                    $tmp_comments[$comment->id] = $comment;
+                }
+                /* Merge, sort and splice the activities and comments */
+                $activities = $tmp_comments + $tmp_activities;
+                ksort( $activities );
+                $activities = array_reverse( array_merge( array(), (array)$activities ) );
+                $activities = array_slice( (array)$activities, intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
+                /* Fetch the totals */
+                $total_activities = count($all_activities) + count($all_comments);
+             } else {
+                if ( $per_page && $page && $max )
+                    $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY id {$sort} {$pag_sql}" ) );
+                else
+                    $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY id {$sort} {$pag_sql} {$max_sql}" ) );
+                $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} {$where_sql} ORDER BY date_recorded {$sort} {$max_sql}" ) );
+             }
+            /* Append threaded comments to those activites that have them */
+            if ( $activities )
+                $activities = BP_Activity_Activity::append_comments( &$activities );
+        }
+        }
+        $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
+        if ( $per_page && $page && $max )
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY date_recorded {$sort} {$pag_sql}" ) );
+        else
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} {$where_sql} ORDER BY date_recorded {$sort} {$pag_sql} {$max_sql}" ) );
+        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} {$where_sql} ORDER BY date_recorded {$sort} {$max_sql}" ) );
+        if ( $activities && $display_comments )
+            $activities = BP_Activity_Activity::append_comments( &$activities );
         return array( 'activities' => $activities, 'total' => (int)$total_activities );

trunk/bp-activity/bp-activity-filters.php

-                      r2138
+                      r2168
 add_filter( 'bp_get_activity_content', 'bp_activity_filter_kses', 1 );
 add_filter( 'bp_get_activity_parent_content', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_get_activity_latest_update', 'bp_activity_filter_kses', 1 );
 add_filter( 'bp_get_activity_content', 'force_balance_tags' );
+add_filter( 'bp_get_activity_latest_update', 'force_balance_tags' );
 add_filter( 'bp_get_activity_content', 'wptexturize' );
 add_filter( 'bp_get_activity_parent_content', 'wptexturize' );
+add_filter( 'bp_get_activity_latest_update', 'wptexturize' );
 add_filter( 'bp_get_activity_content', 'convert_smilies' );
 add_filter( 'bp_get_activity_parent_content', 'convert_smilies' );
+add_filter( 'bp_get_activity_latest_update', 'convert_smilies' );
 add_filter( 'bp_get_activity_content', 'convert_chars' );
 add_filter( 'bp_get_activity_parent_content', 'convert_chars' );
+add_filter( 'bp_get_activity_latest_update', 'convert_chars' );
 add_filter( 'bp_get_activity_content', 'wpautop' );
 …
 add_filter( 'bp_get_activity_content', 'make_clickable' );
 add_filter( 'bp_get_activity_parent_content', 'make_clickable' );
+add_filter( 'bp_get_activity_latest_update', 'make_clickable' );
 add_filter( 'bp_get_activity_content', 'stripslashes_deep' );
 add_filter( 'bp_get_activity_parent_content', 'stripslashes_deep' );
+add_filter( 'bp_get_activity_latest_update', 'stripslashes_deep' );
 add_filter( 'bp_get_activity_parent_content', 'bp_create_excerpt' );

trunk/bp-activity/bp-activity-templatetags.php

-                      r2158
+                      r2168
     var $activities;
     var $activity;
-    var $activity_type;
     var $in_the_loop;
 …
     var $full_name;
     function bp_activity_template( $type, $user_id, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden ) {
+    function bp_activity_template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden ) {
         global $bp;
         $this->pag_page = isset( $_REQUEST['acpage'] ) ? intval( $_REQUEST['acpage'] ) : 1;
+        $this->pag_page = isset( $_REQUEST['acpage'] ) ? intval( $_REQUEST['acpage'] ) : $page;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
-        $this->activity_type = $type;
         if ( !empty( $include ) ) {
             /* Fetch specific activity items based on ID's */
             $this->activities = bp_activity_get_specific( array( 'activity_ids' => explode( ',', $include ), 'max' => $max, 'page' => $page, 'per_page' => $per_page, 'sort' => $sort, 'display_comments' => $display_comments ) );
+            $this->activities = bp_activity_get_specific( array( 'activity_ids' => explode( ',', $include ), 'max' => $max, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'sort' => $sort, 'display_comments' => $display_comments ) );
         } else {
+            if ( $type == 'sitewide' )
+                $this->activities = bp_activity_get_sitewide( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter, 'show_hidden' => $show_hidden ) );
+            if ( $type == 'personal' )
+                $this->activities = bp_activity_get_for_user( array( 'user_id' => $user_id, 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter, 'show_hidden' => $show_hidden ) );
+            if ( $type == 'friends' && ( bp_is_home() || is_site_admin() || $bp->loggedin_user->id == $user_id ) )
+                $this->activities = bp_activity_get_friends_activity( $user_id, $max, false, $this->pag_num, $this->pag_page, $filter );
+            $this->activities = bp_activity_get( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter, 'show_hidden' => $show_hidden ) );
+        }
 …
     $defaults = array(
-        'type' => 'sitewide',
         'display_comments' => false, // false for none, stream/threaded - show comments in the stream or threaded under items
         'include' => false, // pass an activity_id or string of ID's comma separated
         'sort' => 'DESC', // sort DESC or ASC
+        'page' => 1, // which page to load
         'per_page' => 25, // number of items per page
         'max' => false, // max number to return
 …
         $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
     $activities_template = new BP_Activity_Template( $type, $user_id, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden );
+    $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden );
     return apply_filters( 'bp_has_activities', $activities_template->has_activities(), &$activities_template );
 …
+    }
+    if ( 'activity_comment' == $activities_template->activity->component_action )
+        $meta = '</span> <span class="activity-header-meta"> &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $activities_template->activity->item_id . '">' . __( 'View Thread', 'buddypress' ) . '</a>';
+    else
+        $meta = '</span> <span class="activity-header-meta"> &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $activities_template->activity->id . '">' . __( 'Permalink', 'buddypress' ) . '</a>';
+    if ( !bp_is_activity_permalink() ) {
+        if ( 'activity_comment' == $activities_template->activity->component_action )
+            $meta = '</span> <span class="activity-header-meta"> &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $activities_template->activity->item_id . '">' . __( 'View Thread', 'buddypress' ) . '</a>';
+        else
+            $meta = '</span> <span class="activity-header-meta"> &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $activities_template->activity->id . '">' . __( 'View Thread', 'buddypress' ) . '</a>';
+    }
     /* Add the delete link if the user has permission on this item */
     if ( ( $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || is_site_admin() )
          $meta .= ' &middot;' . bp_get_activity_delete_link();
+         $meta .= ' &middot; ' . bp_get_activity_delete_link();
     $content[1] = $meta . '</span>' . $content[1];
 …
         return apply_filters( 'bp_get_activity_delete_link', '<a href="' . wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/' . $activities_template->activity->id, 'bp_activity_delete_link' ) . '" class="item-button delete-activity confirm">' . __( 'Delete', 'buddypress' ) . '</a>' );
+    }
+function bp_activity_latest_update( $user_id = false ) {
+    echo bp_get_activity_latest_update( $user_id );
+}
+    function bp_get_activity_latest_update( $user_id = false ) {
+        global $bp;
+        if ( !$user_id )
+            $user_id = $bp->displayed_user->id;
+        if ( !$update = get_usermeta( $user_id, 'bp_latest_update' ) )
+            return false;
+        $latest_update = '&quot;' . strip_tags( bp_create_excerpt( $update['content'], 40 ) ) . '&quot;';
+        $latest_update .= ' &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $update['id'] . '/"> ' . __( 'View Thread', 'buddypress' ) . '</a>';
+        return apply_filters( 'bp_get_activity_latest_update', $latest_update  );
+    }

trunk/bp-activity/bp-activity-widgets.php

-                      r2158
+                      r2168
 <?php
-/* Register widgets for blogs component */
-function bp_activity_register_widgets() {
-    add_action('widgets_init', create_function('', 'return register_widget("BP_Activity_Widget");') );
+}
-add_action( 'plugins_loaded', 'bp_activity_register_widgets' );
 class BP_Activity_Widget extends WP_Widget {
 …
         </div>
         <div class="activity">
             <?php // The loop will be loaded here via AJAX on page load to retain settings. ?>
 …
+    }
+}
+register_widget( "BP_Activity_Widget" );
 function bp_activity_widget_loop( $type = 'all', $filter = false, $query_string = false, $per_page = 20 ) {
 …
         <?php if ( !$_POST['acpage'] || 1 == $_POST['acpage'] ) : ?>
             <ul id="site-wide-stream" class="activity-list">
+            <ul id="site-wide-stream" class="activity-list item-list">
         <?php endif; ?>
 …
             <li class="<?php bp_activity_css_class() ?>" id="activity-<?php bp_activity_id() ?>">
                 <div class="activity-avatar">
                     <?php bp_activity_avatar('width=40&height=40') ?>
+                    <?php bp_activity_avatar('type=full&width=40&height=40') ?>
                 </div>

trunk/bp-blogs.php

-                      r2120
+                      r2168
 require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-templatetags.php' );
 require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-widgets.php' );
-/* Include deprecated functions if settings allow */
-if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-    require ( BP_PLUGIN_DIR . '/bp-blogs/deprecated/bp-blogs-deprecated.php' );
 function bp_blogs_install() {
 …
     /* Add 'Blogs' to the main navigation */
     bp_core_new_nav_item( array( 'name' => __( 'Blogs', 'buddypress' ), 'slug' => $bp->blogs->slug, 'position' => 30, 'screen_function' => 'bp_blogs_screen_my_blogs', 'default_subnav_slug' => 'my-blogs', 'item_css_id' => $bp->blogs->id ) );
+    bp_core_new_nav_item( array( 'name' => sprintf( __( 'Blogs (%d)', 'buddypress' ), bp_blogs_total_blogs_for_user() ), 'slug' => $bp->blogs->slug, 'position' => 30, 'screen_function' => 'bp_blogs_screen_my_blogs', 'default_subnav_slug' => 'my-blogs', 'item_css_id' => $bp->blogs->id ) );
     $blogs_link = $bp->loggedin_user->domain . $bp->blogs->slug . '/';
 …
     bp_core_new_subnav_item( array( 'name' => __( 'Recent Posts', 'buddypress' ), 'slug' => 'recent-posts', 'parent_url' => $blogs_link, 'parent_slug' => $bp->blogs->slug, 'screen_function' => 'bp_blogs_screen_recent_posts', 'position' => 20 ) );
     bp_core_new_subnav_item( array( 'name' => __( 'Recent Comments', 'buddypress' ), 'slug' => 'recent-comments', 'parent_url' => $blogs_link, 'parent_slug' => $bp->blogs->slug, 'screen_function' => 'bp_blogs_screen_recent_comments', 'position' => 30 ) );
-    bp_core_new_subnav_item( array( 'name' => __( 'Create a Blog', 'buddypress' ), 'slug' => 'create-a-blog', 'parent_url' => $blogs_link, 'parent_slug' => $bp->blogs->slug, 'screen_function' => 'bp_blogs_screen_create_a_blog', 'position' => 40 ) );
     /* Set up the component options navigation for Blog */
 …
         do_action( 'bp_blogs_directory_blogs_setup' );
         bp_core_load_template( apply_filters( 'bp_blogs_template_directory_blogs_setup', 'directories/blogs/index' ) );
+        bp_core_load_template( apply_filters( 'bp_blogs_template_directory_blogs_setup', 'blogs/index' ) );
+    }
+}
 …
 function bp_blogs_screen_my_blogs() {
     do_action( 'bp_blogs_screen_my_blogs' );
     bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'blogs/my-blogs' ) );
+    bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'members/single/blogs' ) );
+}
 function bp_blogs_screen_recent_posts() {
     do_action( 'bp_blogs_screen_recent_posts' );
     bp_core_load_template( apply_filters( 'bp_blogs_template_recent_posts', 'blogs/recent-posts' ) );
+    bp_core_load_template( apply_filters( 'bp_blogs_template_recent_posts', 'members/single/blogs' ) );
+}
 function bp_blogs_screen_recent_comments() {
     do_action( 'bp_blogs_screen_recent_comments' );
     bp_core_load_template( apply_filters( 'bp_blogs_template_recent_comments', 'blogs/recent-comments' ) );
+    bp_core_load_template( apply_filters( 'bp_blogs_template_recent_comments', 'members/single/blogs' ) );
+}
 function bp_blogs_screen_create_a_blog() {
+    global $bp;
+    if ( $bp->current_component != $bp->blogs->slug || 'create' != $bp->current_action )
+        return false;
+    if ( !is_user_logged_in() || !bp_blog_signup_enabled() )
+        return false;
     do_action( 'bp_blogs_screen_create_a_blog' );
     bp_core_load_template( apply_filters( 'bp_blogs_template_create_a_blog', 'blogs/create' ) );
+}
+/* The create screen is not attached to a nav item, so we need to attach it to an action */
+add_action( 'wp', 'bp_blogs_screen_create_a_blog', 3 );
 …
 add_action( 'delete_comment', 'bp_blogs_remove_comment' );
+function bp_blogs_total_blogs() {
+    $blogs = BP_Blogs_Blog::get_all();
+    return $blogs['total'];
+}
+function bp_blogs_total_blogs_for_user( $user_id = false ) {
+    global $bp;
+    if ( !$user_id )
+        $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+    return BP_Blogs_Blog::total_blog_count_for_user( $user_id );
+}
 function bp_blogs_remove_data_for_blog( $blog_id ) {
     global $bp;
 …
     return true;
+}
+/**
+ * bp_blogs_filter_template_paths()
+ *
+ * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
+ * older than 1.2.
+ *
+ * @package BuddyPress Core
+ */
+function bp_blogs_filter_template_paths() {
+    if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+        return false;
+    add_filter( 'bp_blogs_template_directory_blogs_setup', create_function( '', 'return "directories/blogs/index";' ) );
+    add_filter( 'bp_blogs_template_my_blogs', create_function( '', 'return "blogs/my-blogs";' ) );
+    add_filter( 'bp_blogs_template_recent_posts', create_function( '', 'return "blogs/recent-posts";' ) );
+    add_filter( 'bp_blogs_template_recent_comments', create_function( '', 'return "blogs/recent-comments";' ) );
+    add_filter( 'bp_blogs_template_create_a_blog', create_function( '', 'return "blogs/create";' ) );
+}
+add_action( 'init', 'bp_blogs_filter_template_paths' );
 function bp_blogs_remove_data( $user_id ) {

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

-                      r2114
+                      r2168
+    }
     function get_blogs_for_user( $user_id = null ) {
+    function get_blogs_for_user( $user_id = false ) {
         global $bp, $wpdb;
 …
             $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.id, bm1.meta_value as name, bm2.meta_value as description, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1, {$bp->blogs->table_name_blogmeta} bm2 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND b.blog_id = bm2.blog_id AND bm1.meta_key = 'name' AND bm2.meta_key = 'description' AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ", $user_id) );
         $total_blog_count = BP_Blogs_Blog::total_blog_count( $user_id );
+        $total_blog_count = BP_Blogs_Blog::total_blog_count_for_user( $user_id );
         foreach ( (array)$blogs as $blog ) {
 …
+    }
+    function get_blog_ids_for_user( $user_id = false ) {
+        global $bp, $wpdb;
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+        if ( !$user_id )
+            $user_id = $bp->displayed_user->id;
+        return $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$bp->blogs->table_name} WHERE user_id = %d", $user_id ) );
+    }
     function is_recorded( $blog_id ) {
         global $bp, $wpdb;
 …
+    }
     function total_blog_count( $user_id = null ) {
+    function total_blog_count_for_user( $user_id = null ) {
         global $bp, $wpdb;
 …
         // If the user is logged in return the blog count including their hidden blogs.
         if ( !bp_is_home() )
+        if ( !is_user_logged_in() || $user_id != $bp->loggedin_user->id )
             return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id) );
         else
 …
             bp_blogs_setup_globals();
         if ( $limit && $page ) {
+        if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' ORDER BY CONVERT(bm.meta_value, SIGNED) DESC" ) );
+        }
+        $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' ORDER BY CONVERT(bm.meta_value, SIGNED) DESC {$pag_sql}" ) );
+        $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$pag_sql}" ) );
+        $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0" ) );
         return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
 …
         $letter = like_escape( $wpdb->escape( $letter ) );
         if ( $limit && $page ) {
+        if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE bm.meta_key = 'name' AND bm.meta_value LIKE '$letter%%' AND wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY bm.meta_value ASC" ) );
+        }
         $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE bm.meta_key = 'name' AND bm.meta_value LIKE '$letter%%' AND wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY bm.meta_value ASC{$pag_sql}" ) );
+        $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE bm.meta_key = 'name' AND bm.meta_value LIKE '$letter%%' AND wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY bm.meta_value ASC" ) );
         return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
 …
         $filter = like_escape( $wpdb->escape( $filter ) );
         if ( $limit && $page ) {
+        if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE ( ( bm.meta_key = 'name' OR bm.meta_key = 'description' ) AND bm.meta_value LIKE '%%$filter%%' ) AND wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY meta_value ASC" ) );
+        }
         $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE ( ( bm.meta_key = 'name' OR bm.meta_key = 'description' ) AND bm.meta_value LIKE '%%$filter%%' ) AND wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY meta_value ASC{$pag_sql}" ) );
+        $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE ( ( bm.meta_key = 'name' OR bm.meta_key = 'description' ) AND bm.meta_value LIKE '%%$filter%%' ) AND wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY meta_value ASC" ) );
         return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
+    }
     function get_random( $limit = null, $page = null ) {
         global $bp, $wpdb;
         if ( !$bp->blogs )
             bp_blogs_setup_globals();
         if ( $limit && $page ) {
+    function get_random( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
+        global $bp, $wpdb;
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+        if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY rand()" ) );
+        }
+        $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0  ORDER BY rand() {$pag_sql}" ) );
+        if ( $user_id ) {
+            $blog_ids = $wpdb->escape( implode( ',', (array)BP_Blogs_Blog::get_blog_ids_for_user( $user_id) ) );
+            $user_sql = $wpdb->prepare( " AND b.blog_id IN ( {$blog_ids} ) ");
+        }
+        $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$user_sql} ORDER BY rand() {$pag_sql}" ) );
+        $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$user_sql} ORDER BY rand()" ) );
         return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
+    }
     function get_active( $limit = null, $page = null ) {
         global $bp, $wpdb;
         if ( !$bp->blogs )
             bp_blogs_setup_globals();
         if ( $limit && $page ) {
+    function get_active( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
+        global $bp, $wpdb;
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+        if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' ORDER BY CONVERT(bm.meta_value, SIGNED) DESC" ) );
+        }
+        $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' ORDER BY CONVERT(bm.meta_value, SIGNED) DESC {$pag_sql}" ) );
+        if ( $user_id ) {
+            $blog_ids = $wpdb->escape( implode( ',', (array)BP_Blogs_Blog::get_blog_ids_for_user( $user_id ) ) );
+            if ( empty( $blog_ids ) )
+                return false;
+            else
+                $user_sql = $wpdb->prepare( " AND b.blog_id IN ( {$blog_ids} ) " );
+        }
+        if ( !empty( $search_terms ) ) {
+            $filter = like_escape( $wpdb->escape( $search_terms ) );
+            $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm, {$bp->blogs->table_name_blogmeta} bm2, {$wpdb->base_prefix}blogs wb WHERE b.blog_id = wb.blog_id AND b.blog_id = bm.blog_id AND b.blog_id = bm2.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' AND ( ( bm2.meta_key = 'name' OR bm2.meta_key = 'description' ) AND bm2.meta_value LIKE '%%$filter%%' ) {$user_sql} ORDER BY CONVERT(bm.meta_value, SIGNED) DESC {$pag_sql}" ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT bm.blog_id) FROM {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm, {$bp->blogs->table_name_blogmeta} bm2, {$wpdb->base_prefix}blogs wb WHERE b.blog_id = wb.blog_id AND b.blog_id = bm.blog_id AND b.blog_id = bm2.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' AND ( ( bm2.meta_key = 'name' OR bm2.meta_key = 'description' ) AND bm2.meta_value LIKE '%%$filter%%' ) {$user_sql} ORDER BY CONVERT(bm.meta_value, SIGNED) DESC" ) );
+        } else {
+            $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm, {$wpdb->base_prefix}blogs wb WHERE b.blog_id = wb.blog_id AND b.blog_id = bm.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' {$user_sql} ORDER BY CONVERT(bm.meta_value, SIGNED) DESC {$pag_sql}" ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT bm.blog_id) FROM {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm, {$wpdb->base_prefix}blogs wb WHERE b.blog_id = wb.blog_id AND b.blog_id = bm.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' {$user_sql} ORDER BY CONVERT(bm.meta_value, SIGNED) DESC" ) );
+        }
         return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
+    }
     function get_newest( $limit = null, $page = null ) {
         global $bp, $wpdb;
         if ( !$bp->blogs )
             bp_blogs_setup_globals();
         if ( $limit && $page ) {
+    function get_alphabetical( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
+        global $bp, $wpdb;
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+        if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT wb.blog_id) FROM {$wpdb->base_prefix}blogs wb WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 ORDER BY wb.registered DESC" ) );
+        }
+        $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT wb.blog_id FROM {$wpdb->base_prefix}blogs wb WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 ORDER BY wb.registered DESC {$pag_sql}" ) );
+        if ( $user_id ) {
+            $blog_ids = $wpdb->escape( implode( ',', (array)BP_Blogs_Blog::get_blog_ids_for_user( $user_id ) ) );
+            if ( empty( $blog_ids ) )
+                return false;
+            else
+                $user_sql = $wpdb->prepare( " AND b.blog_id IN ( {$blog_ids} ) " );
+        }
+        if ( !empty( $search_terms ) ) {
+            $filter = like_escape( $wpdb->escape( $search_terms ) );
+            $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm, {$bp->blogs->table_name_blogmeta} bm2, {$bp->blogs->table_name_blogmeta} bm3, {$wpdb->base_prefix}blogs wb WHERE b.blog_id = wb.blog_id AND b.blog_id = bm.blog_id AND b.blog_id = bm2.blog_id AND b.blog_id = bm3.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' AND bm2.meta_key = 'name' AND ( ( bm3.meta_key = 'name' OR bm3.meta_key = 'description' ) AND bm3.meta_value LIKE '%%$filter%%' ) {$user_sql} ORDER BY bm2.meta_value ASC {$pag_sql}" ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm, {$bp->blogs->table_name_blogmeta} bm2, {$bp->blogs->table_name_blogmeta} bm3, {$wpdb->base_prefix}blogs wb WHERE b.blog_id = wb.blog_id AND b.blog_id = bm.blog_id AND b.blog_id = bm2.blog_id AND b.blog_id = bm3.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' AND bm2.meta_key = 'name' AND ( ( bm3.meta_key = 'name' OR bm3.meta_key = 'description' ) AND bm3.meta_value LIKE '%%$filter%%' ) {$user_sql}" ) );
+        } else {
+            $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm, {$bp->blogs->table_name_blogmeta} bm2, {$wpdb->base_prefix}blogs wb WHERE b.blog_id = wb.blog_id AND b.blog_id = bm.blog_id AND b.blog_id = bm2.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' AND bm2.meta_key = 'name' {$user_sql} ORDER BY bm2.meta_value ASC {$pag_sql}" ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm, {$bp->blogs->table_name_blogmeta} bm2, {$wpdb->base_prefix}blogs wb WHERE b.blog_id = wb.blog_id AND b.blog_id = bm.blog_id AND b.blog_id = bm2.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' AND bm2.meta_key = 'name' {$user_sql}" ) );
+        }
+        return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
+    }
+    function get_newest( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
+        global $bp, $wpdb;
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $user_id ) {
+            $blog_ids = $wpdb->escape( implode( ',', (array)BP_Blogs_Blog::get_blog_ids_for_user( $bp->loggedin_user->id ) ) );
+            if ( empty( $blog_ids ) )
+                return false;
+            else
+                $user_sql = $wpdb->prepare( " AND b.blog_id IN ( {$blog_ids} ) " );
+        }
+        if ( !empty( $search_terms ) ) {
+            $filter = like_escape( $wpdb->escape( $search_terms ) );
+            $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm WHERE b.blog_id = wb.blog_id AND b.blog_id = bm.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND ( ( bm.meta_key = 'name' OR bm.meta_key = 'description' ) AND bm.meta_value LIKE '%%$filter%%' ) {$user_sql} ORDER BY wb.registered DESC {$pag_sql}" ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm WHERE b.blog_id = wb.blog_id AND b.blog_id = bm.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND ( ( bm.meta_key = 'name' OR bm.meta_key = 'description' ) AND bm.meta_value LIKE '%%$filter%%' ) {$user_sql} ORDER BY wb.registered DESC" ) );
+        } else {
+            $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT wb.blog_id FROM {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name} b WHERE wb.blog_id = b.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$user_sql} ORDER BY wb.registered DESC {$pag_sql}" ) );
+            $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT wb.blog_id) FROM {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name} b WHERE wb.blog_id = b.blog_id AND wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$user_sql} ORDER BY wb.registered DESC" ) );
+        }
         return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );

trunk/bp-blogs/bp-blogs-templatetags.php

-                      r2088
+                      r2168
 <?php
-/* Blog registration template tags */
-function bp_blog_signup_enabled() {
-    $active_signup = get_site_option( 'registration' );
-    if ( !$active_signup )
-        $active_signup = 'all';
-    $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
-    if ( 'none' == $active_signup || 'user' == $active_signup )
-        return false;
-    return true;
+}
-function bp_show_blog_signup_form($blogname = '', $blog_title = '', $errors = '') {
-    global $current_user, $current_site;
-    global $bp;
-    require_once( ABSPATH . WPINC . '/registration.php' );
-    if ( isset($_POST['submit']) ) {
-        bp_blogs_validate_blog_signup();
-    } else {
-        if ( ! is_wp_error($errors) ) {
-            $errors = new WP_Error();
+        }
-        // allow definition of default variables
-        $filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ));
-        $blogname = $filtered_results['blogname'];
-        $blog_title = $filtered_results['blog_title'];
-        $errors = $filtered_results['errors'];
-        if ( $errors->get_error_code() ) {
-            echo "<p>" . __('There was a problem, please correct the form below and try again.', 'buddypress') . "</p>";
+        }
-        ?>
-        <p><?php printf(__("By filling out the form below, you can <strong>add a blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly.", 'buddypress'), $current_user->display_name) ?></p>
-        <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!", 'buddypress') ?></p>
-        <form class="standard-form" id="setupform" method="post" action="<?php echo $bp->loggedin_user->domain . $bp->blogs->slug . '/create-a-blog' ?>">
-            <input type="hidden" name="stage" value="gimmeanotherblog" />
-            <?php do_action( "signup_hidden_fields" ); ?>
-            <?php bp_blogs_signup_blog($blogname, $blog_title, $errors); ?>
-            <p>
-                <input id="submit" type="submit" name="submit" class="submit" value="<?php _e('Create Blog &raquo;', 'buddypress') ?>" />
-            </p>
-            <?php wp_nonce_field( 'bp_blog_signup_form' ) ?>
-        </form>
-        <?php
+    }
+}
-function bp_blogs_signup_blog( $blogname = '', $blog_title = '', $errors = '' ) {
-    global $current_site;
-    // Blog name
-    if( 'no' == constant( "VHOST" ) )
-        echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>';
-    else
-        echo '<label for="blogname">' . __('Blog Domain:', 'buddypress') . '</label>';
-    if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
-        <p class="error"><?php echo $errmsg ?></p>
-    <?php }
-    if( 'no' == constant( "VHOST" ) ) {
-        echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
-    } else {
-        echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
+    }
-    if ( !is_user_logged_in() ) {
-        print '(<strong>' . __( 'Your address will be ' , 'buddypress');
-        if( 'no' == constant( "VHOST" ) ) {
-            print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress');
-        } else {
-            print __( 'domain.' , 'buddypress') . $current_site->domain . $current_site->path;
+        }
-        echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' , 'buddypress') . '</p>';
+    }
-    // Blog Title
-    ?>
-    <label for="blog_title"><?php _e('Blog Title:', 'buddypress') ?></label>
-    <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
-        <p class="error"><?php echo $errmsg ?></p>
-    <?php }
-    echo '<input name="blog_title" type="text" id="blog_title" value="'.wp_specialchars($blog_title, 1).'" /></p>';
-    ?>
-    <p>
-        <label for="blog_public_on"><?php _e('Privacy:', 'buddypress') ?></label>
-        <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.', 'buddypress'); ?>
-        <label class="checkbox" for="blog_public_on">
-            <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || '1' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
-            <strong><?php _e( 'Yes' , 'buddypress'); ?></strong>
-        </label>
-        <label class="checkbox" for="blog_public_off">
-            <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
-            <strong><?php _e( 'No' , 'buddypress'); ?></strong>
-        </label>
-    </p>
-    <?php
-    do_action('signup_blogform', $errors);
+}
-function bp_blogs_validate_blog_signup() {
-    global $wpdb, $current_user, $blogname, $blog_title, $errors, $domain, $path;
-    if ( !check_admin_referer( 'bp_blog_signup_form' ) )
-        return false;
-    $current_user = wp_get_current_user();
-    if( !is_user_logged_in() )
-        die();
-    $result = bp_blogs_validate_blog_form();
-    extract($result);
-    if ( $errors->get_error_code() ) {
-        unset($_POST['submit']);
-        bp_show_blog_signup_form( $blogname, $blog_title, $errors );
-        return false;
+    }
-    $public = (int) $_POST['blog_public'];
-    $meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // depreciated
-    $meta = apply_filters( 'add_signup_meta', $meta );
-    /* If this is a VHOST install, remove the username from the domain as we are setting this blog
-       up inside a user domain, not the root domain. */
-    wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
-    bp_blogs_confirm_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
-    return true;
+}
-function bp_blogs_validate_blog_form() {
-    $user = '';
-    if ( is_user_logged_in() )
-        $user = wp_get_current_user();
-    return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
+}
-function bp_blogs_confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = '' ) {
-    ?>
-    <p><?php _e('Congratulations! You have successfully registered a new blog.', 'buddypress') ?></p>
-    <p>
-        <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new blog.  <a href="%3$s">Login</a> as "%4$s" using your existing password.', 'buddypress'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
-    </p>
-    <?php
-    do_action('signup_finished');
+}
-function bp_create_blog_link() {
-    global $bp;
-    if ( bp_is_home() ) {
-        echo apply_filters( 'bp_create_blog_link', '<a href="' . $bp->loggedin_user->domain . $bp->blogs->slug . '/create-a-blog">' . __('Create a Blog', 'buddypress') . '</a>' );
+    }
+}
-function bp_blogs_blog_tabs() {
-    global $bp, $groups_template;
-    // Don't show these tabs on a user's own profile
-    if ( bp_is_home() )
-        return false;
-    $current_tab = $bp->current_action
-?>
-    <ul class="content-header-nav">
-        <li<?php if ( 'my-blogs' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/my-blogs"><?php printf( __( "%s's Blogs", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
-        <li<?php if ( 'recent-posts' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-posts"><?php printf( __( "%s's Recent Posts", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
-        <li<?php if ( 'recent-comments' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-comments"><?php printf( __( "%s's Recent Comments", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
-    </ul>
-<?php
-    do_action( 'bp_blogs_blog_tabs', $current_tab );
+}
 /**********************************************************************
  * User Blog listing template class
+ * Blog listing template class.
  */
 class BP_Blogs_User_Blogs_Template {
+class BP_Blogs_Template {
     var $current_blog = -1;
     var $blog_count;
 …
     var $total_blog_count;
     function bp_blogs_user_blogs_template( $user_id, $per_page, $max ) {
+    function bp_blogs_template( $type, $page, $per_page, $max, $user_id, $search_terms ) {
         global $bp;
+        if ( !$user_id )
+            $user_id = $bp->displayed_user->id;
+        $this->pag_page = isset( $_GET['fpage'] ) ? intval( $_GET['fpage'] ) : 1;
+        $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $per_page;
+        if ( !$this->blogs = wp_cache_get( 'bp_blogs_for_user_' . $user_id, 'bp' ) ) {
+            $this->blogs = bp_blogs_get_blogs_for_user( $user_id );
+            wp_cache_set( 'bp_blogs_for_user_' . $user_id, $this->blogs, 'bp' );
+        }
+        if ( !$max || $max >= (int)$this->blogs['count'] )
+            $this->total_blog_count = (int)$this->blogs['count'];
+        $this->pag_page = isset( $_REQUEST['bpage'] ) ? intval( $_REQUEST['bpage'] ) : $page;
+        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+        if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
+            $this->blogs = BP_Blogs_Blog::get_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page );
+        } else {
+            switch ( $type ) {
+                case 'random':
+                    $this->blogs = BP_Blogs_Blog::get_random( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                    break;
+                case 'alphabetical':
+                    $this->blogs = BP_Blogs_Blog::get_alphabetical( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                    break;
+                case 'newest':
+                    $this->blogs = BP_Blogs_Blog::get_newest( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                    break;
+                case 'active': default:
+                    $this->blogs = BP_Blogs_Blog::get_active( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                    break;
+            }
+        }
+        if ( !$max || $max >= (int)$this->blogs['total'] )
+            $this->total_blog_count = (int)$this->blogs['total'];
         else
             $this->total_blog_count = (int)$max;
         $this->blogs = array_slice( (array)$this->blogs['blogs'], intval( ( $this->pag_page - 1 ) * $this->pag_num), intval( $this->pag_num ) );
+        $this->blogs = $this->blogs['blogs'];
         if ( $max ) {
 …
         $this->pag_links = paginate_links( array(
             'base' => add_query_arg( 'fpage', '%#%' ),
+            'base' => add_query_arg( 'bpage', '%#%' ),
             'format' => '',
             'total' => ceil($this->total_blog_count / $this->pag_num),
             'current' => $this->pag_page,
             'prev_text' => '&laquo;',
             'next_text' => '&raquo;',
+            'total' => ceil( (int) $this->total_blog_count / (int) $this->pag_num ),
+            'current' => (int) $this->pag_page,
+            'prev_text' => '&larr;',
+            'next_text' => '&rarr;',
             'mid_size' => 1
         ));
 …
+    }
     function user_blogs() {
+    function blogs() {
         if ( $this->current_blog + 1 < $this->blog_count ) {
             return true;
 …
         $this->in_the_loop = true;
         $blog = $this->next_blog();
+        $this->blog = $this->next_blog();
         if ( 0 == $this->current_blog ) // loop has just started
 …
+}
+function bp_rewind_blogs() {
+    global $blogs_template;
+    $blogs_template->rewind_blogs();
+}
 function bp_has_blogs( $args = '' ) {
     global $blogs_template;
     $defaults = array(
+        'user_id' => false,
+        'per_page' => 10,
+        'max' => false
+        'type' => 'active',
+        'page' => 1,
+        'per_page' => 20,
+        'max' => false,
+        'user_id' => false, // Pass a user_id to limit to only blogs this user has higher than subscriber access to
+        'search_terms' => false // Pass search terms to filter on the blog title or description.
     );
 …
     extract( $r, EXTR_SKIP );
+    $blogs_template = new BP_Blogs_User_Blogs_Template( $user_id, $per_page, $max );
+    return apply_filters( 'bp_has_blogs', $blogs_template->has_blogs(), &$blogs_template );
+    // type: active ( default ) | random | newest | alphabetical
+    if ( !empty( $_REQUEST['s'] ) )
+        $search_terms = $_REQUEST['s'];
+    if ( $max ) {
+        if ( $per_page > $max )
+            $per_page = $max;
+    }
+    $blogs_template = new BP_Blogs_Template( $type, $page, $per_page, $max, $user_id, $search_terms );
+    return $blogs_template->has_blogs();
+}
 function bp_blogs() {
     global $blogs_template;
+    return $blogs_template->user_blogs();
+    return $blogs_template->blogs();
+}
 function bp_the_blog() {
     global $blogs_template;
     return $blogs_template->the_blog();
+}
 …
+    }
+function bp_blog_title() {
+    echo bp_get_blog_title();
+}
+    function bp_get_blog_title() {
+function bp_blog_avatar() {
+    echo bp_get_blog_avatar();
+}
+    function bp_get_blog_avatar() {
+        global $blogs_template, $bp;
+        /***
+         * In future BuddyPress versions you will be able to set the avatar for a blog.
+         * Right now you can use a filter with the ID of the blog to change it if you wish.
+         */
+        return apply_filters( 'bp_get_blog_avatar_' . $blogs_template->blog->blog_id, '<img src="' . apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=150" class="avatar blog-avatar" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $blogs_template->blog->blog_id );
+    }
+function bp_blog_avatar_thumb() {
+    echo bp_get_blog_avatar_thumb();
+}
+    function bp_get_blog_avatar_thumb() {
+        global $blogs_template, $bp;
+        return apply_filters( 'bp_get_blog_avatar_thumb_' . $blogs_template->blog->blog_id, '<img src="' . apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=50" class="avatar blog-avatar thumb" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $blogs_template->blog->blog_id );
+    }
+function bp_blog_avatar_mini() {
+    echo bp_get_blog_avatar_mini();
+}
+    function bp_get_blog_avatar_mini() {
+        global $blogs_template, $bp;
+        return apply_filters( 'bp_get_blog_avatar_mini_' . $blogs_template->blog->blog_id, '<img src="' . apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=25" class="avatar blog-avatar mini" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $blogs_template->blog->blog_id );
+    }
+function bp_blog_permalink() {
+    echo bp_get_blog_permalink();
+}
+    function bp_get_blog_permalink() {
         global $blogs_template;
+        return apply_filters( 'bp_get_blog_title', $blogs_template->blog->name );
+        return apply_filters( 'bp_get_blog_permalink', get_blog_option( $blogs_template->blog->blog_id, 'siteurl' ) );
+    }
+function bp_blog_name() {
+    echo bp_get_blog_name();
+}
+    function bp_get_blog_name() {
+        global $blogs_template;
+        return apply_filters( 'bp_get_blog_name', get_blog_option( $blogs_template->blog->blog_id, 'blogname' ) );
+    }
 function bp_blog_description() {
     echo bp_get_blog_description();
+    echo apply_filters( 'bp_blog_description', bp_get_blog_description() );
+}
     function bp_get_blog_description() {
         global $blogs_template;
         return apply_filters( 'bp_get_blog_description', $blogs_template->blog->description );
+    }
 function bp_blog_permalink() {
     echo bp_get_blog_permalink();
+}
     function bp_get_blog_permalink() {
+        return apply_filters( 'bp_get_blog_description', get_blog_option( $blogs_template->blog->blog_id, 'blogdescription' ) );
+    }
+function bp_blog_last_active() {
+    echo bp_get_blog_last_active();
+}
+    function bp_get_blog_last_active() {
         global $blogs_template;
+        return apply_filters( 'bp_get_blog_permalink', $blogs_template->blog->siteurl );
+    }
+        return apply_filters( 'bp_blog_last_active', bp_core_get_last_activity( bp_blogs_get_blogmeta( $blogs_template->blog->blog_id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) ) );
+    }
+function bp_blog_latest_post() {
+    echo bp_get_blog_latest_post();
+}
+    function bp_get_blog_latest_post() {
+        global $blogs_template;
+        if ( $post = bp_blogs_get_latest_posts( $blogs_template->blog->blog_id, 1 ) ) {
+            return apply_filters( 'bp_get_blog_latest_post', sprintf( __( 'Latest Post: %s', 'buddypress' ), '<a href="' . bp_post_get_permalink( $post[0], $blogs_template->blog->blog_id ) . '">' . apply_filters( 'the_title', $post[0]->post_title ) . '</a>' ) );
+        }
+    }
+function bp_blog_hidden_fields() {
+    if ( isset( $_REQUEST['s'] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ). '" name="search_terms" />';
+    }
+    if ( isset( $_REQUEST['letter'] ) ) {
+        echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+    }
+    if ( isset( $_REQUEST['blogs_search'] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['blogs_search'] ) . '" name="search_terms" />';
+    }
+}
+/***
+ * Technically the template loops for blog posts and comments are deprecated.
+ * Instead you should be using the activity stream template loop and filtering
+ * on blog posts and blog comments either with or without a user_id.
+ *
+ * They remain here because they are used in the bp-sn-parent theme, but they
+ * are running on thin ice.
+ */
 /**********************************************************************
 …
+    }
+/**********************************************************************
+ * Site Wide Blog listing template class
+ */
+class BP_Blogs_Site_Blogs_Template {
+    var $current_blog = -1;
+    var $blog_count;
+    var $blogs;
+    var $blog;
+    var $in_the_loop;
+    var $pag_page;
+    var $pag_num;
+    var $pag_links;
+    var $total_blog_count;
+    function bp_blogs_site_blogs_template( $type, $per_page, $max ) {
+        global $bp;
+        $this->pag_page = isset( $_REQUEST['bpage'] ) ? intval( $_REQUEST['bpage'] ) : 1;
+        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+        if ( isset( $_REQUEST['s'] ) && '' != $_REQUEST['s'] && $type != 'random' ) {
+            $this->blogs = BP_Blogs_Blog::search_blogs( $_REQUEST['s'], $this->pag_num, $this->pag_page );
+        } else if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
+            $this->blogs = BP_Blogs_Blog::get_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page );
+/* Blog registration template tags */
+function bp_blog_signup_enabled() {
+    $active_signup = get_site_option( 'registration' );
+    if ( !$active_signup )
+        $active_signup = 'all';
+    $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
+    if ( 'none' == $active_signup || 'user' == $active_signup )
+        return false;
+    return true;
+}
+function bp_show_blog_signup_form($blogname = '', $blog_title = '', $errors = '') {
+    global $current_user, $current_site;
+    global $bp;
+    require_once( ABSPATH . WPINC . '/registration.php' );
+    if ( isset($_POST['submit']) ) {
+        bp_blogs_validate_blog_signup();
+    } else {
+        if ( ! is_wp_error($errors) ) {
+            $errors = new WP_Error();
+        }
+        // allow definition of default variables
+        $filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ));
+        $blogname = $filtered_results['blogname'];
+        $blog_title = $filtered_results['blog_title'];
+        $errors = $filtered_results['errors'];
+        if ( $errors->get_error_code() ) {
+            echo "<p>" . __('There was a problem, please correct the form below and try again.', 'buddypress') . "</p>";
+        }
+        ?>
+        <p><?php printf(__("By filling out the form below, you can <strong>add a blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly.", 'buddypress'), $current_user->display_name) ?></p>
+        <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!", 'buddypress') ?></p>
+        <form class="standard-form" id="setupform" method="post" action="">
+            <input type="hidden" name="stage" value="gimmeanotherblog" />
+            <?php do_action( "signup_hidden_fields" ); ?>
+            <?php bp_blogs_signup_blog($blogname, $blog_title, $errors); ?>
+            <p>
+                <input id="submit" type="submit" name="submit" class="submit" value="<?php _e('Create Blog &raquo;', 'buddypress') ?>" />
+            </p>
+            <?php wp_nonce_field( 'bp_blog_signup_form' ) ?>
+        </form>
+        <?php
+    }
+}
+function bp_blogs_signup_blog( $blogname = '', $blog_title = '', $errors = '' ) {
+    global $current_site;
+    // Blog name
+    if( 'no' == constant( "VHOST" ) )
+        echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>';
+    else
+        echo '<label for="blogname">' . __('Blog Domain:', 'buddypress') . '</label>';
+    if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
+        <p class="error"><?php echo $errmsg ?></p>
+    <?php }
+    if( 'no' == constant( "VHOST" ) ) {
+        echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span> <input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
+    } else {
+        echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /> <span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
+    }
+    if ( !is_user_logged_in() ) {
+        print '(<strong>' . __( 'Your address will be ' , 'buddypress');
+        if( 'no' == constant( "VHOST" ) ) {
+            print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress');
         } else {
+            switch ( $type ) {
+                case 'random':
+                    $this->blogs = BP_Blogs_Blog::get_random( $this->pag_num, $this->pag_page );
+                    break;
+                case 'newest':
+                    $this->blogs = BP_Blogs_Blog::get_newest( $this->pag_num, $this->pag_page );
+                    break;
+                case 'active': default:
+                    $this->blogs = BP_Blogs_Blog::get_active( $this->pag_num, $this->pag_page );
+                    break;
+            }
+        }
+        if ( !$max || $max >= (int)$this->blogs['total'] )
+            $this->total_blog_count = (int)$this->blogs['total'];
+        else
+            $this->total_blog_count = (int)$max;
+        $this->blogs = $this->blogs['blogs'];
+        if ( $max ) {
+            if ( $max >= count($this->blogs) )
+                $this->blog_count = count($this->blogs);
+            else
+                $this->blog_count = (int)$max;
+        } else {
+            $this->blog_count = count($this->blogs);
+        }
+        $this->pag_links = paginate_links( array(
+            'base' => add_query_arg( 'bpage', '%#%' ),
+            'format' => '',
+            'total' => ceil( (int) $this->total_blog_count / (int) $this->pag_num ),
+            'current' => (int) $this->pag_page,
+            'prev_text' => '&laquo;',
+            'next_text' => '&raquo;',
+            'mid_size' => 1
+        ));
+    }
+    function has_blogs() {
+        if ( $this->blog_count )
+            return true;
+            print __( 'domain.' , 'buddypress') . $current_site->domain . $current_site->path;
+        }
+        echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' , 'buddypress') . '</p>';
+    }
+    // Blog Title
+    ?>
+    <label for="blog_title"><?php _e('Blog Title:', 'buddypress') ?></label>
+    <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
+        <p class="error"><?php echo $errmsg ?></p>
+    <?php }
+    echo '<input name="blog_title" type="text" id="blog_title" value="'.wp_specialchars($blog_title, 1).'" /></p>';
+    ?>
+    <p>
+        <label for="blog_public_on"><?php _e('Privacy:', 'buddypress') ?></label>
+        <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.', 'buddypress'); ?>
+        <label class="checkbox" for="blog_public_on">
+            <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || '1' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
+            <strong><?php _e( 'Yes' , 'buddypress'); ?></strong>
+        </label>
+        <label class="checkbox" for="blog_public_off">
+            <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
+            <strong><?php _e( 'No' , 'buddypress'); ?></strong>
+        </label>
+    </p>
+    <?php
+    do_action('signup_blogform', $errors);
+}
+function bp_blogs_validate_blog_signup() {
+    global $wpdb, $current_user, $blogname, $blog_title, $errors, $domain, $path;
+    if ( !check_admin_referer( 'bp_blog_signup_form' ) )
         return false;
+    }
+    function next_blog() {
+        $this->current_blog++;
+        $this->blog = $this->blogs[$this->current_blog];
+        return $this->blog;
+    }
+    function rewind_blogs() {
+        $this->current_blog = -1;
+        if ( $this->blog_count > 0 ) {
+            $this->blog = $this->blogs[0];
+        }
+    }
+    function blogs() {
+        if ( $this->current_blog + 1 < $this->blog_count ) {
+            return true;
+        } elseif ( $this->current_blog + 1 == $this->blog_count ) {
+            do_action('loop_end');
+            // Do some cleaning up after the loop
+            $this->rewind_blogs();
+        }
+        $this->in_the_loop = false;
+    $current_user = wp_get_current_user();
+    if( !is_user_logged_in() )
+        die();
+    $result = bp_blogs_validate_blog_form();
+    extract($result);
+    if ( $errors->get_error_code() ) {
+        unset($_POST['submit']);
+        bp_show_blog_signup_form( $blogname, $blog_title, $errors );
         return false;
+    }
+    function the_blog() {
+        global $blog;
+        $this->in_the_loop = true;
+        $this->blog = $this->next_blog();
+        if ( 0 == $this->current_blog ) // loop has just started
+            do_action('loop_start');
+    }
+}
+function bp_rewind_site_blogs() {
+    global $site_blogs_template;
+    $site_blogs_template->rewind_blogs();
+}
+function bp_has_site_blogs( $args = '' ) {
+    global $site_blogs_template;
+    $defaults = array(
+        'type' => 'active',
+        'per_page' => 10,
+        'max' => false
+    );
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    // type: active ( default ) | random | newest | popular
+    if ( $max ) {
+        if ( $per_page > $max )
+            $per_page = $max;
+    }
+    $site_blogs_template = new BP_Blogs_Site_Blogs_Template( $type, $per_page, $max );
+    return $site_blogs_template->has_blogs();
+}
+function bp_site_blogs() {
+    global $site_blogs_template;
+    return $site_blogs_template->blogs();
+}
+function bp_the_site_blog() {
+    global $site_blogs_template;
+    return $site_blogs_template->the_blog();
+}
+function bp_site_blogs_pagination_count() {
+    global $bp, $site_blogs_template;
+    $from_num = intval( ( $site_blogs_template->pag_page - 1 ) * $site_blogs_template->pag_num ) + 1;
+    $to_num = ( $from_num + ( $site_blogs_template->pag_num - 1 ) > $site_blogs_template->total_blog_count ) ? $site_blogs_template->total_blog_count : $from_num + ( $site_blogs_template->pag_num - 1 ) ;
+    echo sprintf( __( 'Viewing blog %d to %d (of %d blogs)', 'buddypress' ), $from_num, $to_num, $site_blogs_template->total_blog_count ); ?> &nbsp;
+    <span class="ajax-loader"></span><?php
+}
+function bp_site_blogs_pagination_links() {
+    echo bp_get_site_blogs_pagination_links();
+}
+    function bp_get_site_blogs_pagination_links() {
+        global $site_blogs_template;
+        return apply_filters( 'bp_get_site_blogs_pagination_links', $site_blogs_template->pag_links );
+    }
+function bp_the_site_blog_avatar() {
+    echo bp_get_the_site_blog_avatar();
+}
+    function bp_get_the_site_blog_avatar() {
+        global $site_blogs_template, $bp;
+        /***
+         * In future BuddyPress versions you will be able to set the avatar for a blog.
+         * Right now you can use a filter with the ID of the blog to change it if you wish.
+         */
+        return apply_filters( 'bp_get_blogs_blog_avatar_' . $site_blogs_template->blog->blog_id, '<img src="' . apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=150" class="avatar blog-avatar" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $site_blogs_template->blog->blog_id );
+    }
+function bp_the_site_blog_avatar_thumb() {
+    echo bp_get_the_site_blog_avatar_thumb();
+}
+    function bp_get_the_site_blog_avatar_thumb() {
+        global $site_blogs_template, $bp;
+        return apply_filters( 'bp_get_blogs_blog_avatar_thumb_' . $site_blogs_template->blog->blog_id, '<img src="' . apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=50" class="avatar blog-avatar thumb" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $site_blogs_template->blog->blog_id );
+    }
+function bp_the_site_blog_avatar_mini() {
+    echo bp_get_the_site_blog_avatar_mini();
+}
+    function bp_get_the_site_blog_avatar_mini() {
+        global $site_blogs_template, $bp;
+        return apply_filters( 'bp_get_blogs_blog_avatar_mini_' . $site_blogs_template->blog->blog_id, '<img src="' . apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $site_blogs_template->blog->blog_id . '.blogs@' . $bp->root_domain ) . '?d=identicon&amp;s=25" class="avatar blog-avatar mini" alt="' . __( 'Blog Avatar', 'buddypress' ) . '" />', $site_blogs_template->blog->blog_id );
+    }
+function bp_the_site_blog_link() {
+    echo bp_get_the_site_blog_link();
+}
+    function bp_get_the_site_blog_link() {
+        global $site_blogs_template;
+        return apply_filters( 'bp_get_the_site_blog_link', get_blog_option( $site_blogs_template->blog->blog_id, 'siteurl' ) );
+    }
+function bp_the_site_blog_name() {
+    echo bp_get_the_site_blog_name();
+}
+    function bp_get_the_site_blog_name() {
+        global $site_blogs_template;
+        return apply_filters( 'bp_get_the_site_blog_name', get_blog_option( $site_blogs_template->blog->blog_id, 'blogname' ) );
+    }
+function bp_the_site_blog_description() {
+    echo apply_filters( 'bp_the_site_blog_description', bp_get_the_site_blog_description() );
+}
+    function bp_get_the_site_blog_description() {
+        global $site_blogs_template;
+        return apply_filters( 'bp_get_the_site_blog_description', get_blog_option( $site_blogs_template->blog->blog_id, 'blogdescription' ) );
+    }
+function bp_the_site_blog_last_active() {
+    echo bp_get_the_site_blog_last_active();
+}
+    function bp_get_the_site_blog_last_active() {
+        global $site_blogs_template;
+        return apply_filters( 'bp_the_site_blog_last_active', bp_core_get_last_activity( bp_blogs_get_blogmeta( $site_blogs_template->blog->blog_id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) ) );
+    }
+function bp_the_site_blog_latest_post() {
+    echo bp_get_the_site_blog_latest_post();
+}
+    function bp_get_the_site_blog_latest_post() {
+        global $site_blogs_template;
+        if ( $post = bp_blogs_get_latest_posts( $site_blogs_template->blog->blog_id, 1 ) ) {
+            return apply_filters( 'bp_get_the_site_blog_latest_post', sprintf( __( 'Latest Post: %s', 'buddypress' ), '<a href="' . bp_post_get_permalink( $post[0], $site_blogs_template->blog->blog_id ) . '">' . apply_filters( 'the_title', $post[0]->post_title ) . '</a>' ) );
+        }
+    }
+function bp_the_site_blog_hidden_fields() {
+    if ( isset( $_REQUEST['s'] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ). '" name="search_terms" />';
+    }
+    if ( isset( $_REQUEST['letter'] ) ) {
+        echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+    }
+    if ( isset( $_REQUEST['blogs_search'] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['blogs_search'] ) . '" name="search_terms" />';
+    }
+    $public = (int) $_POST['blog_public'];
+    $meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // depreciated
+    $meta = apply_filters( 'add_signup_meta', $meta );
+    /* If this is a VHOST install, remove the username from the domain as we are setting this blog
+       up inside a user domain, not the root domain. */
+    wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
+    bp_blogs_confirm_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
+    return true;
+}
+function bp_blogs_validate_blog_form() {
+    $user = '';
+    if ( is_user_logged_in() )
+        $user = wp_get_current_user();
+    return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
+}
+function bp_blogs_confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = '' ) {
+    ?>
+    <p><?php _e('Congratulations! You have successfully registered a new blog.', 'buddypress') ?></p>
+    <p>
+        <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new blog.  <a href="%3$s">Login</a> as "%4$s" using your existing password.', 'buddypress'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
+    </p>
+    <?php
+    do_action('signup_finished');
+}
+function bp_create_blog_link() {
+    global $bp;
+    if ( bp_is_home() ) {
+        echo apply_filters( 'bp_create_blog_link', '<a href="' . $bp->loggedin_user->domain . $bp->blogs->slug . '/create-a-blog">' . __('Create a Blog', 'buddypress') . '</a>' );
+    }
+}
+function bp_blogs_blog_tabs() {
+    global $bp, $groups_template;
+    // Don't show these tabs on a user's own profile
+    if ( bp_is_home() )
+        return false;
+    $current_tab = $bp->current_action
+?>
+    <ul class="content-header-nav">
+        <li<?php if ( 'my-blogs' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/my-blogs"><?php printf( __( "%s's Blogs", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
+        <li<?php if ( 'recent-posts' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-posts"><?php printf( __( "%s's Recent Posts", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
+        <li<?php if ( 'recent-comments' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-comments"><?php printf( __( "%s's Recent Comments", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
+    </ul>
+<?php
+    do_action( 'bp_blogs_blog_tabs', $current_tab );
+}
 …
+}
+function bp_total_blogs_for_user( $user_id = false ) {
+    global $bp;
+    if ( !$user_id )
+        $user_id = $bp->displayed_user->id;
+    return apply_filters( 'bp_total_blogs_for_user', bp_blogs_total_blogs_for_user( $user_id ) );
+}
+function bp_get_total_blog_count() {
+    return apply_filters( 'bp_get_total_blog_count', bp_blogs_total_blogs() );
+}
 ?>

trunk/bp-blogs/bp-blogs-widgets.php

-                      r1926
+                      r2168
     add_action('widgets_init', create_function('', 'return register_widget("BP_Blogs_Recent_Posts_Widget");') );
+}
 add_action( 'plugins_loaded', 'bp_blogs_register_widgets' );
+add_action( 'template_redirect', 'bp_blogs_register_widgets' );
 class BP_Blogs_Recent_Posts_Widget extends WP_Widget {
 …
     function widget($args, $instance) {
         global $bp;
         extract( $args );
         echo $before_widget;
         echo $before_title
            . $widget_name
+           . $widget_name
            . $after_title; ?>
         <?php
         if ( empty( $instance['max_posts'] ) || !$instance['max_posts'] )
             $instance['max_posts'] = 10; ?>
         <?php $posts = bp_blogs_get_latest_posts( null, $instance['max_posts'] ) ?>
         <?php $counter = 0; ?>
         <?php if ( $posts ) : ?>
             <div class="item-options" id="recent-posts-options">
 …
                         </div>
                     </li>
                     <?php $counter++; ?>
+                    <?php $counter++; ?>
                 <?php endforeach; ?>
             </ul>
 …
             </div>
         <?php endif; ?>
         <?php echo $after_widget; ?>
     <?php

trunk/bp-core.php

-                      r2128
+                      r2168
     require ( BP_PLUGIN_DIR . '/bp-core/bp-core-adminbar.php' );
-/* If BP_IGNORE_DEPRECATED is defined, do not load any deprecated functions for backwards support */
-if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-    require ( BP_PLUGIN_DIR . '/bp-core/deprecated/bp-core-deprecated.php' );
 /* Define the slug for member pages and the members directory (e.g. domain.com/[members] ) */
 if ( !defined( 'BP_MEMBERS_SLUG' ) )
 …
 if ( !defined( 'BP_HOME_BLOG_SLUG' ) )
     define( 'BP_HOME_BLOG_SLUG', 'blog' );
-/* Register BuddyPress themes contained within the theme folder */
-if ( function_exists( 'register_theme_folder' ) )
-    register_theme_folder( 'buddypress/bp-themes' );
 /* Register BuddyPress themes contained within the theme folder */
 …
 /********************************************************************************
- * Screen Functions
+ *
- * Screen functions are the controllers of BuddyPress. They will execute when their
- * specific URL is caught. They will first save or manipulate data using business
- * functions, then pass on the user to a template file.
- */
-/********************************************************************************
  * Action Functions
+ *
 …
  */
 /**
  * bp_core_action_directory_members()
 …
         do_action( 'bp_core_action_directory_members' );
         bp_core_load_template( apply_filters( 'bp_core_template_directory_members', 'directories/members/index' ) );
+        bp_core_load_template( apply_filters( 'bp_core_template_directory_members', 'members/index' ) );
+    }
+}
 …
      * looking at their own profile, don't create the nav item.
      */
     if ( !$show_for_displayed_user && !bp_is_home() )
+    if ( !$show_for_displayed_user && !bp_is_my_profile() )
         return false;
 …
     $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) );
     return apply_filters( 'bp_core_get_userlink_by_username', bp_core_get_userlink( $user_id, false, false, true ) );
+}
+/**
+ * bp_core_get_total_member_count()
+ *
+ * Returns the total number of members for the installation.
+ *
+ * @package BuddyPress Core
+ * @return int The total number of members.
+ */
+function bp_core_get_total_member_count() {
+    global $wpdb;
+    $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0" ) );
+    return apply_filters( 'bp_core_get_total_member_count', (int)$count );
+}
 …
  * bp_core_boot_spammer()
+ *
  * When a user logs in, check if they have been marked as a spammer. If then simply
+ * When a user logs in, check if they have been marked as a spammer. If yes then simply
  * redirect them to the home page and stop them from logging in.
+ *
 …
+}
 add_action( 'in_plugin_update_message-buddypress/bp-loader.php', 'bp_core_update_message' );
+/**
+ * bp_core_filter_template_paths()
+ *
+ * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
+ * older than 1.2.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_filter_template_paths() {
+    if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+        return false;
+    add_filter( 'bp_core_template_directory_members', create_function( '', 'return "directories/members/index";' ) );
+    add_filter( 'bp_core_template_plugin', create_function( '', 'return "plugin-template";' ) );
+}
+add_action( 'init', 'bp_core_filter_template_paths' );
 /**

trunk/bp-core/bp-core-admin.php

-                      r2077
+                      r2168
                     </td>
                 </tr>
-                <?php if ( function_exists('bp_wire_install') ) { ?>
-                <tr>
-                    <th scope="row"><?php _e( 'Allow non-friends to post on profile wires?', 'buddypress' ) ?>:</th>
-                    <td>
-                        <input type="radio" name="bp-admin[non-friend-wire-posting]"<?php if ( (int)get_site_option( 'non-friend-wire-posting' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-non-friend-wire-post" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
-                        <input type="radio" name="bp-admin[non-friend-wire-posting]"<?php if ( !(int)get_site_option( 'non-friend-wire-posting' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-non-friend-wire-post" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
-                    </td>
-                </tr>
-                <?php } ?>
                 <tr>
                     <th scope="row"><?php _e( 'Disable user account deletion?', 'buddypress' ) ?>:</th>
 …
                     </td>
                 </tr>
-                <?php endif; ?>
-                <?php $themes = bp_core_get_buddypress_themes() ?>
-                <?php if ( $themes ) : ?>
-                    <tr>
-                        <th scope="row"><?php _e('Select theme to use for BuddyPress generated pages', 'buddypress' ) ?>:</th>
-                        <td>
-                                <select name="bp-admin[active-member-theme]" id="active-member-theme">
-                                <?php
-                                for ( $i = 0; $i < count($themes); $i++ ) {
-                                    if ( $themes[$i]['template'] == get_site_option( 'active-member-theme' ) ) {
-                                        $selected = ' selected="selected"';
-                                    } else {
-                                        $selected = '';
+                                    }
-                                ?>
-                                <option<?php echo $selected ?> value="<?php echo $themes[$i]['template'] ?>"><?php echo $themes[$i]['name'] ?> (<?php echo $themes[$i]['version'] ?>)</option>
-                                <?php } ?>
-                            </select>
-                        </td>
-                    </tr>
-                <?php else : ?>
-                    <?php if ( '' == locate_template( array( 'registration/register.php' ), false ) && $current_blog->blog_id == BP_ROOT_BLOG ) : ?>
-                        <div class="error">
-                            <p><?php _e( '<strong>Your currently active theme is not BuddyPress enabled.</strong><p style="margin: 2px 0">Visit <a href="http://buddypress.org/extend/themes/">http://buddypress.org/extend/themes/</a> to browse themes that include support for BuddyPress features.</p>', 'buddypress' ) ?></p>
-                        </div>
-                    <?php endif; ?>
                 <?php endif; ?>
 …
                 <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-activity.php') ) : ?>
                 <tr>
                     <td><h3><?php _e( 'Activity Streams', 'buddypress' ) ?></h3><p><?php _e( 'Tracks user activity across the entire site.', 'buddypress' ) ?></p></td>
+                    <td><h3><?php _e( 'Activity Streams', 'buddypress' ) ?></h3><p><?php _e( 'Allow users to post activity updates and track all activity across the entire site.', 'buddypress' ) ?></p></td>
                     <td>
                         <input type="radio" name="bp_components[bp-activity.php]" value="1"<?php if ( !isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> &nbsp;
 …
                         <input type="radio" name="bp_components[bp-messages.php]" value="1"<?php if ( !isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?>  &nbsp;
                         <input type="radio" name="bp_components[bp-messages.php]" value="0"<?php if ( isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
-                    </td>
-                </tr>
-                <?php endif; ?>
-                <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-wire.php') ) : ?>
-                <tr>
-                    <td><h3><?php _e( 'Comment Wire', 'buddypress' ) ?></h3><p><?php _e( 'Let users leave a comment on groups, profiles and custom components.', 'buddypress' ) ?></p></td>
-                    <td>
-                        <input type="radio" name="bp_components[bp-wire.php]" value="1"<?php if ( !isset( $disabled_components['bp-wire.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?>  &nbsp;
-                        <input type="radio" name="bp_components[bp-wire.php]" value="0"<?php if ( isset( $disabled_components['bp-wire.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
                     </td>
                 </tr>
 …
                 </tr>
                 <?php endif; ?>
-                <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-status.php') ) : ?>
-                <tr>
-                    <td><h3><?php _e( 'Status Updates', 'buddypress' ) ?></h3><p><?php _e( 'Allow users to post status updates.', 'buddypress' ) ?></p></td>
-                    <td width="45%">
-                        <input type="radio" name="bp_components[bp-status.php]" value="1"<?php if ( !isset( $disabled_components['bp-status.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?>  &nbsp;
-                        <input type="radio" name="bp_components[bp-status.php]" value="0"<?php if ( isset( $disabled_components['bp-status.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
-                    </td>
-                </tr>
-                <?php endif; ?>
             </tbody>
             </table>

trunk/bp-core/bp-core-adminbar.php

-                      r2114
+                      r2168
         return false;
     echo '<div id="wp-admin-bar">';
+    echo '<div id="wp-admin-bar"><div class="padder">';
     // **** Do bp-adminbar-logo Actions ********
 …
     echo '</ul>';
     echo '</div>';
+    echo '</div></div>';
+}
 …
 add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu', 2 );
 add_action( 'bp_adminbar_menus', 'bp_adminbar_account_menu', 4 );
+add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu', 6 );
+if ( function_exists('bp_blogs_install') )
+    add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu', 6 );
 add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
+add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
+if ( function_exists('bp_blogs_install') )
+    add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
 add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu', 100 );

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

-                      r2120
+                      r2168
         'css_id' => false,
         'alt' => __( 'Avatar Image', 'buddypress' ),
+        'email' => false, // Pass the user email (for gravatar) to prevent querying the DB for it
         'no_grav' => false // If there is no avatar found, return false instead of a grav?
     );
 …
         $html_height = ( 'thumb' == $type ) ? ' height="' . BP_AVATAR_THUMB_HEIGHT . '"' : ' height="' . BP_AVATAR_FULL_HEIGHT . '"';
     $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', get_blog_option( BP_ROOT_BLOG, 'siteurl' ) . '/' . basename( WP_CONTENT_DIR ) . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
+    $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', $bp->root_domain . '/' . basename( WP_CONTENT_DIR ) . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
     $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
 …
         if ( 'user' == $object ) {
+            $grav_email = bp_core_get_user_email( $item_id );
+            if ( empty( $email ) )
+                $email = bp_core_get_user_email( $item_id );
         } else if ( 'group' == $object || 'blog' == $object ) {
             $grav_email = "{$item_id}-{$object}@{$bp->root_domain}";
+            $email = "{$item_id}-{$object}@{$bp->root_domain}";
+        }
         $grav_email = apply_filters( 'bp_core_gravatar_email', $grav_email, $item_id, $object );
         $gravatar = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $grav_email ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
+        $email = apply_filters( 'bp_core_gravatar_email', $email, $item_id, $object );
+        $gravatar = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $email ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
         return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params );

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

-                      r2114
+                      r2168
     var $last_active;
-    var $profile_last_updated;
     /* Extras */
 …
         $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb' ) );
         $this->avatar_mini = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'width' => 30, 'height' => 30 ) );
+        $this->last_active = bp_core_get_last_activity( get_usermeta( $this->id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) );
+    }
 …
     /* Static Functions */
+    function get_newest_users( $limit = null, $page = 1 ) {
+        global $wpdb;
+    function get_users( $type, $limit = null, $page = 1, $user_id = false, $search_terms = false ) {
+        global $wpdb, $bp;
+        $sql = array();
+        $sql['select_main'] = "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email";
+        if ( 'active' == $type || 'online' == $type )
+            $sql['select_active'] = ", um.meta_value as last_activity";
+        if ( 'popular' == $type )
+            $sql['select_popular'] = ", um.meta_value as total_friend_count";
+        if ( 'alphabetical' == $type )
+            $sql['select_alpha'] = ", pd.value as fullname";
+        $sql['from'] = "FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN " . CUSTOM_USER_META_TABLE . " um ON um.user_id = u.ID";
+        if ( $search_terms && function_exists( 'xprofile_install' ) || 'alphabetical' == $type )
+            $sql['join_profiledata'] = "LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id";
+        $sql['where'] = "WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0";
+        if ( 'active' == $type || 'online' == $type )
+            $sql['where_active'] = "AND um.meta_key = 'last_activity'";
+        if ( 'popular' == $type )
+            $sql['where_popular'] = "AND um.meta_key = 'total_friend_count'";
+        if ( 'online' == $type )
+            $sql['where_online'] = "AND DATE_ADD( FROM_UNIXTIME(um.meta_value), INTERVAL 5 MINUTE ) >= NOW()";
+        if ( 'alphabetical' == $type )
+            $sql['where_alpha'] = "AND pd.field_id = 1";
+        if ( $user_id && function_exists( 'friends_install' ) ) {
+            $friend_ids = friends_get_friend_user_ids( $user_id );
+            $friend_ids = $wpdb->escape( implode( ',', (array)$friend_ids ) );
+            $sql['where_friends'] = "AND u.ID IN ({$friend_ids})";
+        }
+        if ( $search_terms && function_exists( 'xprofile_install' ) ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";
+        }
+        switch ( $type ) {
+            case 'active': default:
+                $sql[] = "ORDER BY um.meta_value DESC";
+                break;
+            case 'newest':
+                $sql[] = "ORDER BY u.user_registered DESC";
+                break;
+            case 'alphabetical':
+                $sql[] = "ORDER BY pd.value ASC";
+                break;
+            case 'random':
+                $sql[] = "ORDER BY rand()";
+                break;
+            case 'online':
+                $sql[] = "ORDER BY FROM_UNIXTIME(um.meta_value) DESC";
+                break;
+            case 'popular':
+                $sql[] = "ORDER BY CONVERT(um.meta_value, SIGNED) DESC";
+                break;
+        }
+        if ( $limit && $page )
+            $sql['pagination'] = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        /* Get paginated results */
+        $paged_users = $wpdb->get_results( $wpdb->prepare( join( ' ', (array)$sql ) ) );
+    //  var_dump( join( ' ', $sql ) );
+        /* Re-jig the SQL so we can get the total user count */
+        unset( $sql['select_main'] );
+        if ( !empty( $sql['select_active'] ) )
+            unset( $sql['select_active'] );
+        if ( !empty( $sql['select_popular'] ) )
+            unset( $sql['select_popular'] );
+        if ( !empty( $sql['select_alpha'] ) )
+            unset( $sql['select_alpha'] );
+        if ( !empty( $sql['pagination'] ) )
+            unset( $sql['pagination'] );
+        array_unshift( $sql, "SELECT COUNT(DISTINCT u.ID)" );
+        /* Get total user results */
+        $total_users = $wpdb->get_var( $wpdb->prepare( join( ' ', (array)$sql ) ) );
+        /***
+         * Lets fetch some other useful data in a separate queries, this will be faster than querying the data for every user in a list.
+         * We can't add these to the main query above since only users who have this information will be returned (since the much of the data is in usermeta and won't support any type of directional join)
+         */
+        foreach ( $paged_users as $user )
+            $user_ids[] = $user->id;
+        $user_ids = $wpdb->escape( join( ',', (array)$user_ids ) );
+        /* Add additional data to the returned results */
+        $paged_users = BP_Core_User::get_user_extras( &$paged_users, $user_ids, $type );
+        return array( 'users' => $paged_users, 'total' => $total_users );
+    }
+    function get_users_by_letter( $letter, $limit = null, $page = 1 ) {
+        global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        $total_users_sql = apply_filters( 'bp_core_newest_users_count_sql', "SELECT COUNT(DISTINCT ID) FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0 AND deleted = 0 AND user_status = 0 ORDER BY user_registered DESC" );
+        $paged_users_sql = apply_filters( 'bp_core_newest_users_sql', "SELECT DISTINCT ID as user_id, DATE_ADD( user_registered, INTERVAL " . get_option('gmt_offset') . " HOUR ) as user_registered FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0 AND deleted = 0 AND user_status = 0 ORDER BY user_registered DESC{$pag_sql}", $pag_sql );
+        if ( strlen($letter) > 1 || is_numeric($letter) || !$letter )
+            return false;
+        $letter = like_escape( $wpdb->escape( $letter ) );
+        $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT u.ID) FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter );
+        $paged_users_sql = apply_filters( 'bp_core_users_by_letter_sql', $wpdb->prepare( "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter, $pag_sql );
         $total_users = $wpdb->get_var( $total_users_sql );
         $paged_users = $wpdb->get_results( $paged_users_sql );
+        /***
+         * Lets fetch some other useful data in a separate queries, this will be faster than querying the data for every user in a list.
+         * We can't add these to the main query above since only users who have this information will be returned (since the much of the data is in usermeta and won't support any type of directional join)
+         */
+        foreach ( $paged_users as $user )
+            $user_ids[] = $user->id;
+        $user_ids = $wpdb->escape( join( ',', (array)$user_ids ) );
+        /* Add additional data to the returned results */
+        $paged_users = BP_Core_User::get_user_extras( &$paged_users, &$user_ids );
         return array( 'users' => $paged_users, 'total' => $total_users );
+    }
     function get_active_users( $limit = null, $page = 1 ) {
         global $wpdb;
+    function get_specific_users( $user_ids, $limit = null, $page = 1 ) {
+        global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        $total_users_sql = apply_filters( 'bp_core_active_users_count_sql', "SELECT COUNT(DISTINCT um.user_id) FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY FROM_UNIXTIME(um.meta_value) DESC" );
+        $paged_users_sql = apply_filters( 'bp_core_active_users_sql', "SELECT DISTINCT user_id FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY FROM_UNIXTIME(um.meta_value) DESC{$pag_sql}", $pag_sql );
+        $user_sql = " AND user_id IN ( " . $wpdb->escape( $user_ids ) . " ) ";
+        $total_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT ID) FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0 AND deleted = 0 AND user_status = 0 AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) " ), $wpdb->escape( $user_ids ) );
+        $paged_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT DISTINCT ID as id, user_registered, user_nicename, user_login, user_email FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0 AND deleted = 0 AND user_status = 0 AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) {$pag_sql}" ), $wpdb->escape( $user_ids ) );
         $total_users = $wpdb->get_var( $total_users_sql );
         $paged_users = $wpdb->get_results( $paged_users_sql );
+        /***
+         * Lets fetch some other useful data in a separate queries, this will be faster than querying the data for every user in a list.
+         * We can't add these to the main query above since only users who have this information will be returned (since the much of the data is in usermeta and won't support any type of directional join)
+         */
+        foreach ( $paged_users as $user )
+            $user_ids[] = $user->id;
+        $user_ids = $wpdb->escape( join( ',', (array)$user_ids ) );
+        /* Add additional data to the returned results */
+        $paged_users = BP_Core_User::get_user_extras( &$paged_users, &$user_ids );
         return array( 'users' => $paged_users, 'total' => $total_users );
+    }
+    function get_popular_users( $limit = null, $page = 1 ) {
+        global $wpdb;
+        if ( !function_exists('friends_install') )
+            return false;
+    function search_users( $search_terms, $limit = null, $page = 1 ) {
+        global $wpdb, $bp;
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        $total_users_sql = apply_filters( 'bp_core_popular_users_count_sql', "SELECT COUNT(DISTINCT um.user_id) FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'total_friend_count' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY CONVERT(um.meta_value, SIGNED) DESC" );
+        $paged_users_sql = apply_filters( 'bp_core_popular_users_sql', "SELECT DISTINCT um.user_id FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'total_friend_count' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 ORDER BY CONVERT(um.meta_value, SIGNED) DESC{$pag_sql}", $pag_sql );
+        $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+        $total_users_sql = apply_filters( 'bp_core_search_users_count_sql', "SELECT COUNT(DISTINCT u.ID) as id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC", $search_terms );
+        $paged_users_sql = apply_filters( 'bp_core_search_users_sql', "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC{$pag_sql}", $search_terms, $pag_sql );
         $total_users = $wpdb->get_var( $total_users_sql );
         $paged_users = $wpdb->get_results( $paged_users_sql );
+        /***
+         * Lets fetch some other useful data in a separate queries, this will be faster than querying the data for every user in a list.
+         * We can't add these to the main query above since only users who have this information will be returned (since the much of the data is in usermeta and won't support any type of directional join)
+         */
+        foreach ( $paged_users as $user )
+            $user_ids[] = $user->id;
+        $user_ids = $wpdb->escape( join( ',', (array)$user_ids ) );
+        /* Add additional data to the returned results */
+        $paged_users = BP_Core_User::get_user_extras( &$paged_users, &$user_ids );
         return array( 'users' => $paged_users, 'total' => $total_users );
+    }
+    function get_random_users( $limit = null, $page = 1 ) {
+        global $wpdb, $bp;
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        $total_users_sql = apply_filters( 'bp_core_random_users_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT um.user_id) FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND u.ID != %d ORDER BY RAND() DESC", $bp->loggedin_user->id ) );
+        $paged_users_sql = apply_filters( 'bp_core_random_users_sql', $wpdb->prepare( "SELECT DISTINCT um.user_id FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND u.ID != %d ORDER BY RAND(){$pag_sql}", $bp->loggedin_user->id ), $pag_sql );
+        $total_users = $wpdb->get_var( $total_users_sql );
+        $paged_users = $wpdb->get_results( $paged_users_sql );
+        return array( 'users' => $paged_users, 'total' => $total_users );
+    }
+    function get_online_users( $limit = null, $page = 1 ) {
+        global $wpdb;
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        $total_users_sql = apply_filters( 'bp_core_online_users_count_sql', "SELECT COUNT(DISTINCT um.user_id) FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND DATE_ADD( FROM_UNIXTIME(um.meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY FROM_UNIXTIME(um.meta_value) DESC" );
+        $paged_users_sql = apply_filters( 'bp_core_online_users_sql', "SELECT DISTINCT um.user_id FROM " . CUSTOM_USER_META_TABLE . " um LEFT JOIN " . CUSTOM_USER_TABLE . " u ON u.ID = um.user_id WHERE um.meta_key = 'last_activity' AND u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND DATE_ADD( FROM_UNIXTIME(um.meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY FROM_UNIXTIME(um.meta_value) DESC{$pag_sql}", $pag_sql );
+        $total_users = $wpdb->get_var( $total_users_sql );
+        $paged_users = $wpdb->get_results( $paged_users_sql );
+        return array( 'users' => $paged_users, 'total' => $total_users );
+    }
+    function get_alphabetical_users( $limit = null, $page = 1 ) {
+        global $wpdb, $bp;
+        if ( !function_exists( 'xprofile_install' ) )
+            return BP_Core_User::get_active_users( $limit, $page );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        $total_users_sql = apply_filters( 'bp_core_search_users_count_sql', "SELECT DISTINCT u.ID as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC", $search_terms );
+        $paged_users_sql = apply_filters( 'bp_core_search_users_sql', "SELECT DISTINCT u.ID as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC{$pag_sql}", $search_terms, $pag_sql );
+        $total_users = $wpdb->get_var( $total_users_sql );
+        $paged_users = $wpdb->get_results( $paged_users_sql );
+        return array( 'users' => $paged_users, 'total' => $total_users );
+    }
+    function get_users_by_letter( $letter, $limit = null, $page = 1 ) {
+        global $wpdb, $bp;
+        if ( !function_exists('xprofile_install') )
+            return BP_Core_User::get_active_users( $limit, $page );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( strlen($letter) > 1 || is_numeric($letter) || !$letter )
+            return false;
+        $letter = like_escape( $wpdb->escape( $letter ) );
+        $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT u.ID) FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter );
+        $paged_users_sql = apply_filters( 'bp_core_users_by_letter_sql', $wpdb->prepare( "SELECT DISTINCT u.ID as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter, $pag_sql );
+        $total_users = $wpdb->get_var( $total_users_sql );
+        $paged_users = $wpdb->get_results( $paged_users_sql );
+        return array( 'users' => $paged_users, 'total' => $total_users );
+    }
+    function search_users( $search_terms, $limit = null, $page = 1 ) {
+        global $wpdb, $bp;
+        if ( !function_exists('xprofile_install') )
+            return BP_Core_User::get_active_users( $limit, $page );
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+        $total_users_sql = apply_filters( 'bp_core_search_users_count_sql', "SELECT COUNT(DISTINCT u.ID) as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC", $search_terms );
+        $paged_users_sql = apply_filters( 'bp_core_search_users_sql', "SELECT DISTINCT u.ID as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC{$pag_sql}", $search_terms, $pag_sql );
+        $total_users = $wpdb->get_var( $total_users_sql );
+        $paged_users = $wpdb->get_results( $paged_users_sql );
+        return array( 'users' => $paged_users, 'total' => $total_users );
+    function get_user_extras( $paged_users, $user_ids, $type = false ) {
+        global $bp, $wpdb;
+        if ( empty( $user_ids ) )
+            return $paged_users;
+        /* Fetch the user's full name */
+        if ( function_exists( 'xprofile_install' ) && 'alphabetical' != $type ) {
+            $names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id as id, pd.value as fullname FROM {$bp->profile->table_name_fields} pf, {$bp->profile->table_name_data} pd WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} )", BP_XPROFILE_FULLNAME_FIELD_NAME ) );
+            for ( $i = 0; $i < count( $paged_users ); $i++ ) {
+                foreach ( $names as $name ) {
+                    if ( $name->id == $paged_users[$i]->id )
+                        $paged_users[$i]->fullname = $name->fullname;
+                }
+            }
+        }
+        /* Fetch the user's total friend count */
+        if ( 'popular' != $type ) {
+            $friend_count = $wpdb->get_results( "SELECT user_id as id, meta_value as total_friend_count FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = 'total_friend_count' AND user_id IN ( {$user_ids} )" );
+            for ( $i = 0; $i < count( $paged_users ); $i++ ) {
+                foreach ( $friend_count as $count ) {
+                    if ( $count->id == $paged_users[$i]->id )
+                        $paged_users[$i]->total_friend_count = (int)$count->total_friend_count;
+                }
+            }
+        }
+        /* Fetch the user's last_activity */
+        if ( 'active' != $type ) {
+            $user_activity = $wpdb->get_results( "SELECT user_id as id, meta_value as last_activity FROM " . CUSTOM_USER_META_TABLE . " WHERE meta_key = 'last_activity' AND user_id IN ( {$user_ids} )" );
+            for ( $i = 0; $i < count( $paged_users ); $i++ ) {
+                foreach ( $user_activity as $activity ) {
+                    if ( $activity->id == $paged_users[$i]->id )
+                        $paged_users[$i]->last_activity = (int)$activity->last_activity;
+                }
+            }
+        }
+        return $paged_users;
+    }
+}

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

-                      r2114
+                      r2168
     add_action( 'bp_template_content', 'bp_core_screen_general_settings_content' );
     bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
+    bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'members/single/plugins' ) );
+}
 …
         <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ) ?>
+        <p class="submit"><input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
+        <div class="submit">
+            <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
+        </div>
         <?php wp_nonce_field('bp_settings_general') ?>
     </form>
 …
     add_action( 'bp_template_content', 'bp_core_screen_notification_settings_content' );
     bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
+    bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'members/single/plugins' ) );
+}
 …
         <?php do_action( 'bp_notification_settings' ) ?>
+        <p class="submit"><input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
+        <div class="submit">
+            <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto"/></p>
+        </div>
         <?php wp_nonce_field('bp_settings_notifications') ?>
 …
     add_action( 'bp_template_content', 'bp_core_screen_delete_account_content' );
     bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
+    bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'members/single/plugins' ) );
+}
 …
         <input type="checkbox" name="delete-account-understand" id="delete-account-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-account-button').disabled = ''; } else { document.getElementById('delete-account-button').disabled = 'disabled'; }" /> <?php _e( 'I understand the consequences of deleting my account.', 'buddypress' ); ?>
+        <p><input type="submit" disabled="disabled" value="<?php _e( 'Delete My Account', 'buddypress' ) ?> &raquo;" id="delete-account-button" name="delete-account-button" /></p>
+        <div class="submit">
+            <input type="submit" disabled="disabled" value="<?php _e( 'Delete My Account', 'buddypress' ) ?> &raquo;" id="delete-account-button" name="delete-account-button" /></p>
+        </div>
         <?php wp_nonce_field('delete-account') ?>
     </form>

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

-                      r2145
+                      r2168
 <?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 ) {
+        global $bp, $bp_the_member_query;
+        $this->pag_page = isset( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : $page_number;
+        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+        $this->type = $type;
+        if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
+            $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page );
+        }
+        else if ( false !== $include ) {
+            $this->members = BP_Core_User::get_specific_users( $include, $this->pag_num, $this->pag_page );
+        }
+        else {
+            $this->members = BP_Core_User::get_users( $this->type, $this->pag_num, $this->pag_page, $user_id, $search_terms );
+        }
+        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('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('loop_start');
+    }
+}
+function bp_rewind_members() {
+    global $members_template;
+    return $members_template->rewind_members();
+}
+function bp_has_members( $args = '' ) {
+    global $bp, $members_template;
+    // type: active ( default ) | random | newest | popular | online | alphabetical
+    $defaults = array(
+        'type' => 'active',
+        'page' => 1,
+        'per_page' => 10,
+        'max' => false,
+        'include' => false, // Pass a user_id or comma separated list of user_ids to only show these users
+        'user_id' => false, // Pass a user_id to only show friends of this user
+        'search_terms' => false // Pass search_terms to filter users by their profile data
+    );
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    if ( $max ) {
+        if ( $per_page > $max )
+            $per_page = $max;
+    }
+    /* Pass a filter if ?s= is set. */
+    if ( $_REQUEST['s'] )
+        $search_terms = $_REQUEST['s'];
+    $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include );
+    return $members_template->has_members();
+}
+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() {
+    global $bp, $members_template;
+    $from_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
+    $to_num = ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1) ;
+    if ( 'active' == $members_template->type )
+        echo sprintf( __( 'Viewing member %d to %d (of %d active members)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count );
+    else if ( 'popular' == $members_template->type )
+        echo sprintf( __( 'Viewing member %d to %d (of %d members with friends)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count );
+    else if ( 'online' == $members_template->type )
+        echo sprintf( __( 'Viewing member %d to %d (of %d members online)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count );
+    else
+        echo sprintf( __( 'Viewing member %d to %d (of %d members)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count );
+    ?><span class="ajax-loader"></span><?php
+}
+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 );
+    }
+function bp_member_user_id() {
+    echo bp_get_member_user_id();
+}
+    function bp_get_member_user_id() {
+        global $members_template;
+        return apply_filters( 'bp_get_member_user_id', $members_template->member->id );
+    }
+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' => __( 'Member avatar', '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;
+        echo 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;
+        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' );
+function bp_member_last_active() {
+    echo bp_get_member_last_active();
+}
+    function bp_get_member_last_active() {
+        global $members_template;
+        $last_activity = attribute_escape( 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_profile_data( $field_name = false ) {
+    echo bp_get_member_profile_data( $field_name );
+}
+    function bp_get_member_profile_data( $field_name = false ) {
+        global $members_template;
+        if ( !$field_name || !function_exists( 'xprofile_install' ) )
+            return false;
+        // Populate the user if it hasn't been already.
+        if ( empty( $members_template->member->profile_data ) )
+            $members_template->member = new BP_Core_User( $members_template->member->id );
+        return apply_filters( 'bp_get_member_profile_data', $members_template->member->profile_data[$field_name]['field_data'], $members_template->member->profile_data[$field_name]['field_type'] );
+    }
+function bp_member_registered() {
+    echo bp_get_member_registered();
+}
+    function bp_get_member_registered() {
+        global $members_template;
+        $registered = attribute_escape( 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_add_friend_button() {
+    global $members_template;
+    if ( function_exists( 'bp_add_friend_button' ) ) {
+        echo bp_add_friend_button( $members_template->member->id );
+    }
+}
+function bp_member_total_friend_count() {
+    global $members_template;
+    echo bp_get_member_total_friend_count();
+}
+    function bp_get_member_total_friend_count() {
+        global $members_template;
+        if ( 1 == (int) $members_template->member->total_friend_count )
+            return apply_filters( 'bp_get_member_total_friend_count', sprintf( __( '%d friend', 'buddypress' ), (int) $members_template->member->total_friend_count ) );
+        else
+            return apply_filters( 'bp_get_member_total_friend_count', sprintf( __( '%d friends', 'buddypress' ), (int) $members_template->member->total_friend_count ) );
+    }
+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="' . attribute_escape( $_REQUEST['s'] ) . '" name="search_terms" />';
+    }
+    if ( isset( $_REQUEST['letter'] ) ) {
+        echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+    }
+    if ( isset( $_REQUEST['members_search'] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['members_search'] ) . '" name="search_terms" />';
+    }
+}
+function bp_directory_members_search_form() {
+    global $bp;
+    $search_value = __( 'Search anything...', 'buddypress' );
+    if ( !empty( $_GET['s'] ) )
+        $search_value = $_GET['s'];
+    else if ( !empty( $_COOKIE['bp-members-search-terms'] ) && 'false' != $_COOKIE['bp-members-search-terms'] )
+        $search_value = $_COOKIE['bp-members-search-terms'];
+    ?>
+    <form action="" method="get" id="search-members-form">
+        <label><input type="text" name="s" id="members_search" value="<?php echo attribute_escape( $search_value ) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+        <input type="submit" id="members_search_submit" name="members_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+        <?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ) ?>
+    </form>
+<?php
+}
+function bp_home_blog_url() {
+    global $bp, $current_blog;
+    if ( defined( 'BP_ENABLE_MULTIBLOG' ) ) {
+        $blog_id = $current_blog->blog_id;
+    } else {
+        $blog_id = BP_ROOT_BLOG;
+    }
+    if ( 'bphome' == get_blog_option( $blog_id, 'template' ) )
+        echo $bp->root_domain . '/' . BP_HOME_BLOG_SLUG;
+    else
+        echo $bp->root_domain;
+}
+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_get_total_member_count() );
+    }
+/** Navigation and other misc template tags **/
 /**
  * bp_get_nav()
 …
            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_home() && $bp->displayed_user->id ) {
+        if ( !bp_is_my_profile() && $bp->displayed_user->id ) {
             $selected = '';
 …
     foreach ( $bp->bp_nav as $user_nav_item ) {
         if ( !$user_nav_item['show_for_displayed_user'] )
+        if ( !$user_nav_item['show_for_displayed_user'] && !bp_is_my_profile() )
             continue;
 …
+}
 function bp_is_home() {
+function bp_is_my_profile() {
     global $bp;
 …
     return false;
+}
+function bp_is_home() { return bp_is_my_profile(); }
 function bp_last_activity( $user_id = false, $echo = true ) {
 …
 /*** CUSTOM LOOP TEMPLATE CLASSES *******************/
-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, $per_page, $max ) {
-        global $bp, $bp_the_member_query;
-        $this->pag_page = isset( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : 1;
-        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
-        if ( isset( $_REQUEST['s'] ) && '' != $_REQUEST['s'] && $type != 'random' ) {
-            $this->members = BP_Core_User::search_users( $_REQUEST['s'], $this->pag_num, $this->pag_page );
-        } else if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
-            $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page );
-        } else {
-            switch ( $type ) {
-                case 'random':
-                    $this->members = BP_Core_User::get_random_users( $this->pag_num, $this->pag_page );
-                    break;
-                case 'newest':
-                    $this->members = BP_Core_User::get_newest_users( $this->pag_num, $this->pag_page );
-                    break;
-                case 'popular':
-                    $this->members = BP_Core_User::get_popular_users( $this->pag_num, $this->pag_page );
-                    break;
-                case 'online':
-                    $this->members = BP_Core_User::get_online_users( $this->pag_num, $this->pag_page );
-                    break;
-                case 'alphabetical':
-                    $this->members = BP_Core_User::get_alphabetical_users( $this->pag_num, $this->pag_page );
-                    break;
-                case 'active': default:
-                    $this->members = BP_Core_User::get_active_users( $this->pag_num, $this->pag_page );
-                    break;
+            }
+        }
-        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' => '&laquo;',
-                'next_text' => '&raquo;',
-                '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 site_members() {
-        if ( $this->current_member + 1 < $this->member_count ) {
-            return true;
-        } elseif ( $this->current_member + 1 == $this->member_count ) {
-            do_action('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();
-        $user_id = $this->member->user_id;
-        $user_registered = $this->member->user_registered;
-        if ( !$this->member = wp_cache_get( 'bp_user_' . $user_id, 'bp' ) ) {
-            $this->member = new BP_Core_User( $user_id );
-            wp_cache_set( 'bp_user_' . $user_id, $this->member, 'bp' );
+        }
-        if ( $user_registered )
-            $this->member->user_registered = $user_registered;
-        if ( 0 == $this->current_member ) // loop has just started
-            do_action('loop_start');
+    }
+}
-function bp_rewind_site_members() {
-    global $site_members_template;
-    return $site_members_template->rewind_members();
+}
-function bp_has_site_members( $args = '' ) {
-    global $bp, $site_members_template;
-    $defaults = array(
-        'type' => 'active',
-        'per_page' => 10,
-        'max' => false
-    );
-    $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );
-    // type: active ( default ) | random | newest | popular | online | alphabetical
-    if ( $max ) {
-        if ( $per_page > $max )
-            $per_page = $max;
+    }
-    $site_members_template = new BP_Core_Members_Template( $type, $per_page, $max );
-    return $site_members_template->has_members();
+}
-function bp_the_site_member() {
-    global $site_members_template;
-    return $site_members_template->the_member();
+}
-function bp_site_members() {
-    global $site_members_template;
-    return $site_members_template->site_members();
+}
-function bp_site_members_pagination_count() {
-    global $bp, $site_members_template;
-    $from_num = intval( ( $site_members_template->pag_page - 1 ) * $site_members_template->pag_num ) + 1;
-    $to_num = ( $from_num + ( $site_members_template->pag_num - 1 ) > $site_members_template->total_member_count ) ? $site_members_template->total_member_count : $from_num + ( $site_members_template->pag_num - 1) ;
-    echo sprintf( __( 'Viewing member %d to %d (of %d members)', 'buddypress' ), $from_num, $to_num, $site_members_template->total_member_count ); ?> &nbsp;
-    <span class="ajax-loader"></span><?php
+}
-function bp_site_members_pagination_links() {
-    echo bp_get_site_members_pagination_links();
+}
-    function bp_get_site_members_pagination_links() {
-        global $site_members_template;
-        return apply_filters( 'bp_get_site_members_pagination_links', $site_members_template->pag_links );
+    }
-function bp_the_site_member_user_id() {
-    echo bp_get_the_site_member_user_id();
+}
-    function bp_get_the_site_member_user_id() {
-        global $site_members_template;
-        return apply_filters( 'bp_get_the_site_member_user_id', $site_members_template->member->id );
+    }
-function bp_the_site_member_avatar( $args = '' ) {
-    echo apply_filters( 'bp_the_site_member_avatar', bp_get_the_site_member_avatar( $args ) );
+}
-    function bp_get_the_site_member_avatar( $args = '' ) {
-        global $bp, $site_members_template;
-        $defaults = array(
-            'type' => 'thumb',
-            'width' => false,
-            'height' => false,
-            'class' => 'avatar',
-            'id' => false,
-            'alt' => __( 'Member avatar', 'buddypress' )
-        );
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-        /* Fetch the avatar from the folder, if not provide backwards compat. */
-        if ( !$avatar = bp_core_fetch_avatar( array( 'item_id' => $site_members_template->member->id, 'type' => $type, 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height ) ) )
-            $avatar = '<img src="' . attribute_escape( $site_members_template->member->avatar_thumb ) . '" class="avatar" alt="' . __( 'Member avatar', 'buddypress' ) . '" />';
-        return apply_filters( 'bp_get_the_site_member_avatar', $avatar );
+    }
-function bp_the_site_member_link() {
-    echo bp_get_the_site_member_link();
+}
-    function bp_get_the_site_member_link() {
-        global $site_members_template;
-        echo apply_filters( 'bp_get_the_site_member_link', $site_members_template->member->user_url );
+    }
-function bp_the_site_member_name() {
-    echo apply_filters( 'bp_the_site_member_name', bp_get_the_site_member_name() );
+}
-    function bp_get_the_site_member_name() {
-        global $site_members_template;
-        return apply_filters( 'bp_get_the_site_member_name', $site_members_template->member->fullname );
+    }
-    add_filter( 'bp_get_the_site_member_name', 'wp_filter_kses' );
-    add_filter( 'bp_get_the_site_member_name', 'stripslashes' );
-function bp_the_site_member_last_active() {
-    echo bp_get_the_site_member_last_active();
+}
-    function bp_get_the_site_member_last_active() {
-        global $site_members_template;
-        $last_activity = attribute_escape( bp_core_get_last_activity( get_usermeta( $site_members_template->member->id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) ) );
-        return apply_filters( 'bp_the_site_member_last_active', $last_activity );
+    }
-function bp_the_site_member_profile_data( $field_name = false ) {
-    echo bp_get_the_site_member_profile_data( $field_name );
+}
-    function bp_get_the_site_member_profile_data( $field_name = false ) {
-        global $site_members_template;
-        if ( !$field_name || !function_exists( 'xprofile_install' ) )
-            return false;
-        return apply_filters( 'bp_get_the_site_member_profile_data', $site_members_template->member->profile_data[$field_name]['field_data'], $site_members_template->member->profile_data[$field_name]['field_type'] );
+    }
-function bp_the_site_member_registered() {
-    echo bp_get_the_site_member_registered();
+}
-    function bp_get_the_site_member_registered() {
-        global $site_members_template;
-        return apply_filters( 'bp_the_site_member_last_active', strtotime( $site_members_template->member->user_registered ) );
+    }
-function bp_the_site_member_add_friend_button() {
-    global $site_members_template;
-    if ( function_exists( 'bp_add_friend_button' ) ) {
-        echo bp_add_friend_button( $site_members_template->member->id );
+    }
+}
-function bp_the_site_member_total_friend_count() {
-    global $site_members_template;
-    if ( !(int) $site_members_template->member->total_friends )
-        return false;
-    echo bp_get_the_site_member_total_friend_count();
+}
-    function bp_get_the_site_member_total_friend_count() {
-        global $site_members_template;
-        if ( !(int) $site_members_template->member->total_friends )
-            return false;
-        if ( 1 == (int) $site_members_template->member->total_friends )
-            return apply_filters( 'bp_get_the_site_member_total_friend_count', sprintf( __( '%d friend', 'buddypress' ), (int) $site_members_template->member->total_friends ) );
-        else
-            return apply_filters( 'bp_get_the_site_member_total_friend_count', sprintf( __( '%d friends', 'buddypress' ), (int) $site_members_template->member->total_friends ) );
+    }
-function bp_the_site_member_random_profile_data() {
-    global $site_members_template;
-    if ( function_exists( 'xprofile_get_random_profile_data' ) ) { ?>
-        <?php $random_data = xprofile_get_random_profile_data( $site_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_the_site_member_hidden_fields() {
-    if ( isset( $_REQUEST['s'] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ) . '" name="search_terms" />';
+    }
-    if ( isset( $_REQUEST['letter'] ) ) {
-        echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+    }
-    if ( isset( $_REQUEST['members_search'] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['members_search'] ) . '" name="search_terms" />';
+    }
+}
-function bp_directory_members_search_form() {
-    global $bp; ?>
-    <form action="" method="get" id="search-members-form">
-        <label><input type="text" name="s" id="members_search" value="<?php if ( isset( $_GET['s'] ) ) { echo attribute_escape( $_GET['s'] ); } else { _e( 'Search anything...', 'buddypress' ); } ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
-        <input type="submit" id="members_search_submit" name="members_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
-        <?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ) ?>
-    </form>
-<?php
+}
-function bp_home_blog_url() {
-    global $bp, $current_blog;
-    if ( defined( 'BP_ENABLE_MULTIBLOG' ) ) {
-        $blog_id = $current_blog->blog_id;
-    } else {
-        $blog_id = BP_ROOT_BLOG;
+    }
-    if ( 'bphome' == get_blog_option( $blog_id, 'template' ) )
-        echo $bp->root_domain . '/' . BP_HOME_BLOG_SLUG;
-    else
-        echo $bp->root_domain;
+}
 /* Template functions for fetching globals, without querying the DB again
 …
+}
+function bp_user_fullname() {
+    global $bp;
     echo apply_filters( 'bp_user_fullname', $bp->displayed_user->fullname );
+}
     function bp_displayed_user_fullname() {
+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() {
 …
+    }
+/* This function will pass a AJAX built querystring to a loop in the template */
+function bp_ajax_querystring() {
+    global $bp;
+    return apply_filters( 'bp_ajax_querystring', $bp->ajax_querystring );
+}
 /* Template is_() functions to determine the current page */
 …
     if ( BP_ACTIVITY_SLUG == $bp->current_component && 'my-friends' == $bp->current_action )
+        return true;
+    return false;
+}
+function bp_is_activity_permalink() {
+    global $bp;
+    if ( BP_ACTIVITY_SLUG == $bp->current_component && is_numeric( $bp->current_action ) )
         return true;
 …
         if ( bp_is_user_activity() )
             $bp_classes[] = 'my-activity';
+        if ( bp_is_activity_permalink() )
+            $bp_classes[] = 'activity-permalink';
         if ( bp_is_register_page() )

trunk/bp-core/bp-core-widgets.php

-                      r2077
+                      r2168
            . $after_title; ?>
         <?php if ( bp_has_site_members( 'type=newest&max=' . $instance['max_members'] ) ) : ?>
+        <?php if ( bp_has_members( 'type=newest&max=' . $instance['max_members'] ) ) : ?>
             <div class="item-options" id="members-list-options">
                 <span class="ajax-loader" id="ajax-loader-members"></span>
 …
             <ul id="members-list" class="item-list">
                 <?php while ( bp_site_members() ) : bp_the_site_member(); ?>
+                <?php while ( bp_members() ) : bp_the_member(); ?>
                     <li class="vcard">
                         <div class="item-avatar">
                             <a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_avatar() ?></a>
+                            <a href="<?php bp_member_permalink() ?>"><?php bp_member_avatar() ?></a>
                         </div>
                         <div class="item">
                             <div class="item-title fn"><a href="<?php bp_the_site_member_link() ?>" title="<?php bp_the_site_member_name() ?>"><?php bp_the_site_member_name() ?></a></div>
                             <div class="item-meta"><span class="activity"><?php echo bp_core_get_last_activity( bp_get_the_site_member_registered(), __( 'registered %s ago', 'buddypress' ) ) ?></span></div>
+                            <div class="item-title fn"><a href="<?php bp_member_permalink() ?>" title="<?php bp_member_name() ?>"><?php bp_member_name() ?></a></div>
+                            <div class="item-meta"><span class="activity"><?php bp_member_registered() ?></span></div>
                         </div>
                     </li>
 …
            . $after_title; ?>
         <?php if ( bp_has_site_members( 'type=online&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] ) ) : ?>
+        <?php if ( bp_has_members( 'type=online&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] ) ) : ?>
             <div class="avatar-block">
                 <?php while ( bp_site_members() ) : bp_the_site_member(); ?>
+                <?php while ( bp_members() ) : bp_the_site_member(); ?>
                     <div class="item-avatar">
                         <a href="<?php bp_the_site_member_link() ?>" title="<?php bp_the_site_member_name() ?>"><?php bp_the_site_member_avatar() ?></a>
 …
     switch ( $_POST['filter'] ) {
         case 'newest-members':
+            if ( !$users = wp_cache_get( 'newest_users', 'bp' ) ) {
+                $users = BP_Core_User::get_newest_users( $_POST['max-members'], 1 );
+                wp_cache_set( 'newest_users', $users, 'bp' );
+            }
+            $type = 'newest';
         break;
         case 'recently-active-members':
+            if ( !$users = wp_cache_get( 'active_users', 'bp' ) ) {
+                $users = BP_Core_User::get_active_users( $_POST['max-members'], 1 );
+                wp_cache_set( 'active_users', $users, 'bp' );
+            }
+            $type = 'active';
         break;
         case 'popular-members':
+            if ( !$users = wp_cache_get( 'popular_users', 'bp' ) ) {
+                $users = BP_Core_User::get_popular_users( $_POST['max-members'], 1 );
+                wp_cache_set( 'popular_users', $users, 'bp' );
+            }
+            $type = 'popular';
         break;
+    }
+    if ( $users['users'] ) {
+        echo '0[[SPLIT]]'; // return valid result.
+        foreach ( (array) $users['users'] as $user ) {
+        ?>
+            <li class="vcard">
+                <div class="item-avatar">
+                    <a href="<?php echo bp_core_get_userlink( $user->user_id, false, true ) ?>"><?php echo bp_core_get_avatar( $user->user_id, 1 ) ?></a>
+                </div>
+                <div class="item">
+                    <div class="item-title"><?php echo bp_core_get_userlink( $user->user_id ) ?></div>
+                    <div class="item-meta">
+                        <span class="activity">
+                            <?php
+                            if ( 'newest-members' == $_POST['filter'] ) {
+                                echo bp_core_get_last_activity( $user->user_registered, __( 'registered %s ago', 'buddypress' ) );
+                            } else if ( 'recently-active-members' == $_POST['filter'] ) {
+                                echo bp_core_get_last_activity( get_usermeta( $user->user_id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) );
+                            } else if ( 'popular-members' == $_POST['filter'] ) {
+                                if ( 1 == get_usermeta( $user->user_id, 'total_friend_count' ) )
+                                    echo get_usermeta( $user->user_id, 'total_friend_count' ) . __(' friend', 'buddypress');
+                                else
+                                    echo get_usermeta( $user->user_id, 'total_friend_count' ) . __(' friends', 'buddypress');
+                            }
+                            ?>
+                        </span>
+    } ?>
+    <?php if ( bp_has_members( 'type=' . $type . '&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] ) ) : ?>
+        <?php echo '0[[SPLIT]]'; // return valid result. TODO: remove this because it's dumb. ?>
+        <div class="avatar-block">
+            <?php while ( bp_members() ) : bp_the_member(); ?>
+                <li class="vcard">
+                    <div class="item-avatar">
+                        <a href="<?php bp_member_permalink() ?>"><?php bp_member_avatar() ?></a>
                     </div>
+                </div>
+            </li>
+            <?php
+        }
+    } else {
+        echo "-1[[SPLIT]]<li>" . __("No members matched the current filter.", 'buddypress');
+    }
+                    <div class="item">
+                        <div class="item-title fn"><a href="<?php bp_member_permalink() ?>" title="<?php bp_member_name() ?>"><?php bp_member_name() ?></a></div>
+                        <?php if ( 'active' == $type ) : ?>
+                            <div class="item-meta"><span class="activity"><?php bp_member_last_active() ?></span></div>
+                        <?php else : ?>
+                            <div class="item-meta"><span class="activity"><?php bp_member_total_friend_count() ?></span></div>
+                        <?php endif; ?>
+                    </div>
+                </li>
+            <?php endwhile; ?>
+        </div>
+    <?php else: ?>
+        <?php echo "-1[[SPLIT]]<li>"; ?>
+        <?php _e( 'There were no members found, please try another filter.', 'buddypress' ) ?>
+        <?php echo "</li>"; ?>
+    <?php endif;
+}
 add_action( 'wp_ajax_widget_members', 'bp_core_ajax_widget_members' );

trunk/bp-core/js/widget-members.js

-                      r1838
+                      r2168
 jQuery(document).ready( function() {
     jQuery("div#members-list-options a").livequery('click',
         function() {
+    jQuery("div#members-list-options a").live('click',
+        function() {
             jQuery('#ajax-loader-members').toggle();
 …
             },
             function(response)
+            {
+            {
                 jQuery('#ajax-loader-members').toggle();
                 member_wiget_response(response);
             });
             return false;
+        }
 …
     if ( response[0] != "-1" ) {
         jQuery("ul#members-list").fadeOut(200,
+        jQuery("ul#members-list").fadeOut(200,
             function() {
                 jQuery("ul#members-list").html(response[1]);
 …
         );
     } else {
         jQuery("ul#members-list").fadeOut(200,
+    } else {
+        jQuery("ul#members-list").fadeOut(200,
             function() {
                 var message = '<p>' + response[1] + '</p>';

trunk/bp-forums.php

-                      r2077
+                      r2168
         do_action( 'bbpress_init' );
+        /* Check to see if the user has posted a new topic from the forums page. */
+        if ( isset( $_POST['submit_topic'] ) && function_exists( 'bp_forums_new_topic' ) ) {
+            /* Check the nonce */
+            check_admin_referer( 'bp_forums_new_topic' );
+            if ( $group = groups_get_group( array( 'group_id' => $_POST['topic_group_id'] ) ) ) {
+                /* Auto join this user if they are not yet a member of this group */
+                if ( !is_site_admin() && 'public' == $group->status && !groups_is_user_member( $bp->loggedin_user->id, $group->id ) )
+                    groups_join_group( $group->id, $group->id );
+                if ( $forum_id = groups_get_groupmeta( $group->id, 'forum_id' ) ) {
+                    if ( !$topic = groups_new_group_forum_topic( $_POST['topic_title'], $_POST['topic_text'], $_POST['topic_tags'], $forum_id ) )
+                        bp_core_add_message( __( 'There was an error when creating the topic', 'buddypress'), 'error' );
+                    else
+                        bp_core_add_message( __( 'The topic was created successfully', 'buddypress') );
+                    bp_core_redirect( bp_get_group_permalink( $group ) . '/forum/topic/' . $topic->topic_slug . '/' );
+                }
+            }
+        }
         do_action( 'bp_forums_directory_forums_setup' );
+        bp_core_load_template( apply_filters( 'bp_forums_template_directory_forums_setup', 'directories/forums/index' ) );
+        bp_core_load_template( apply_filters( 'bp_forums_template_directory_forums_setup', 'forums/index' ) );
+    }
+}
 …
+}
 add_filter( 'user_has_cap', 'bp_forums_filter_caps' );
+/**
+ * bp_forums_filter_template_paths()
+ *
+ * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
+ * older than 1.2.
+ *
+ * @package BuddyPress Core
+ */
+function bp_forums_filter_template_paths() {
+    if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+        return false;
+    add_filter( 'bp_forums_template_directory_forums_setup', create_function( '', 'return "directories/forums/index";' ) );
+}
+add_action( 'init', 'bp_forums_filter_template_paths' );
 ?>

trunk/bp-forums/bp-forums-templatetags.php

-                      r2077
+                      r2168
     var $order;
     function BP_Forums_Template_Forum( $type, $forum_id, $per_page, $max, $no_stickies, $filter ) {
+    function BP_Forums_Template_Forum( $type, $forum_id, $page, $per_page, $max, $no_stickies, $filter ) {
         global $bp;
         $this->pag_page = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : 1;
+        $this->pag_page = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : $page;
         $this->pag_num = isset( $_REQUEST['n'] ) ? intval( $_REQUEST['n'] ) : $per_page;
 …
             'total' => ceil($this->total_topic_count / $this->pag_num),
             'current' => $this->pag_page,
             'prev_text' => '&laquo;',
             'next_text' => '&raquo;',
+            'prev_text' => '&larr;',
+            'next_text' => '&rarr;',
             'mid_size' => 1
         ));
 …
         'type' => 'newest',
         'forum_id' => false,
+        'page' => 1,
         'per_page' => 15,
         'max' => false,
 …
         $filter = $_GET['fs'];
     $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $per_page, $max, $no_stickies, $filter );
+    $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $page, $per_page, $max, $no_stickies, $filter );
     return apply_filters( 'bp_has_topics', $forum_template->has_topics(), &$forum_template );
 …
         extract( $r, EXTR_SKIP );
         $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'edit', 'bp_forums_edit_topic' ) . '">' . __( 'Edit', 'buddypress' ) . '</a>';
+        $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'edit', 'bp_forums_edit_topic' ) . '">' . __( 'Edit Topic', 'buddypress' ) . '</a>';
         if ( $bp->is_item_admin || $bp->is_item_mod || is_site_admin() ) {
             if ( 0 == (int)$forum_template->topic->topic_sticky )
                 $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'stick', 'bp_forums_stick_topic' ) . '">' . __( 'Sticky', 'buddypress' ) . '</a>';
+                $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'stick', 'bp_forums_stick_topic' ) . '">' . __( 'Sticky Topic', 'buddypress' ) . '</a>';
             else
                 $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'unstick', 'bp_forums_unstick_topic' ) . '">' . __( 'Un-stick', 'buddypress' ) . '</a>';
+                $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'unstick', 'bp_forums_unstick_topic' ) . '">' . __( 'Un-stick Topic', 'buddypress' ) . '</a>';
             if ( 0 == (int)$forum_template->topic->topic_open )
                 $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'open', 'bp_forums_open_topic' ) . '">' . __( 'Open', 'buddypress' ) . '</a>';
+                $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'open', 'bp_forums_open_topic' ) . '">' . __( 'Open Topic', 'buddypress' ) . '</a>';
             else
                 $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'close', 'bp_forums_close_topic' ) . '">' . __( 'Close', 'buddypress' ) . '</a>';
             $links[] = '<a class="confirm" id="topic-delete-link" href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'delete', 'bp_forums_delete_topic' ) . '">' . __( 'Delete', 'buddypress' ) . '</a>';
+                $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'close', 'bp_forums_close_topic' ) . '">' . __( 'Close Topic', 'buddypress' ) . '</a>';
+            $links[] = '<a class="confirm" id="topic-delete-link" href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'delete', 'bp_forums_delete_topic' ) . '">' . __( 'Delete Topic', 'buddypress' ) . '</a>';
+        }
 …
         extract( $r, EXTR_SKIP );
         $links  = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . $topic_template->post->id . 'edit/post/' . $topic_template->post->post_id, 'bp_forums_edit_post' ) . '">' . __( 'Edit', 'buddypress' ) . '</a> ' . $seperator . ' ';
         $links .= '<a class="confirm" id="post-delete-link" href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'delete/post/' . $topic_template->post->post_id, 'bp_forums_delete_post' ) . '">' . __( 'Delete', 'buddypress' ) . '</a>';
+        $links  = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . $topic_template->post->id . 'edit/post/' . $topic_template->post->post_id, 'bp_forums_edit_post' ) . '">' . __( 'Edit Post', 'buddypress' ) . '</a> ' . $seperator . ' ';
+        $links .= '<a class="confirm" id="post-delete-link" href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'delete/post/' . $topic_template->post->post_id, 'bp_forums_delete_post' ) . '">' . __( 'Delete Post', 'buddypress' ) . '</a>';
         return $links;

trunk/bp-friends.php

-                      r2120
+                      r2168
 require ( BP_PLUGIN_DIR . '/bp-friends/bp-friends-classes.php' );
 require ( BP_PLUGIN_DIR . '/bp-friends/bp-friends-templatetags.php' );
-/* Include deprecated functions if settings allow */
-if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-    require ( BP_PLUGIN_DIR . '/bp-friends/deprecated/bp-friends-deprecated.php' );
 function friends_install() {
 …
     /* Add 'Friends' to the main navigation */
     bp_core_new_nav_item( array( 'name' => __('Friends', 'buddypress'), 'slug' => $bp->friends->slug, 'position' => 60, 'screen_function' => 'friends_screen_my_friends', 'default_subnav_slug' => 'my-friends', 'item_css_id' => $bp->friends->id ) );
+    bp_core_new_nav_item( array( 'name' => sprintf( __( 'Friends (%d)', 'buddypress' ), friends_get_total_friend_count() ), 'slug' => $bp->friends->slug, 'position' => 60, 'screen_function' => 'friends_screen_my_friends', 'default_subnav_slug' => 'my-friends', 'item_css_id' => $bp->friends->id ) );
     $friends_link = $bp->loggedin_user->domain . $bp->friends->slug . '/';
 …
     do_action( 'friends_screen_my_friends' );
     bp_core_load_template( apply_filters( 'friends_template_my_friends', 'friends/index' ) );
+    bp_core_load_template( apply_filters( 'friends_template_my_friends', 'members/single/friends' ) );
+}
 …
         check_admin_referer( 'friends_reject_friendship' );
         if ( friends_reject_friendship( $bp->action_variables[1] ) ) {
             bp_core_add_message( __( 'Friendship rejected', 'buddypress' ) );
 …
     do_action( 'friends_screen_requests' );
+    bp_core_load_template( apply_filters( 'friends_template_requests', 'friends/requests' ) );
+}
+function friends_screen_friend_finder() {
+    do_action( 'friends_screen_friend_finder' );
+    bp_core_load_template( apply_filters( 'friends_template_friend_finder', 'friends/friend-finder' ) );
+    bp_core_load_template( apply_filters( 'friends_template_requests', 'members/single/friends' ) );
+}
 …
  */
-function friends_check_user_has_friends( $user_id ) {
-    $friend_count = get_usermeta( $user_id, 'total_friend_count');
-    if ( empty( $friend_count ) )
-        return false;
-    if ( !(int)$friend_count )
-        return false;
-    return true;
+}
-function friends_get_friend_user_ids( $user_id, $friend_requests_only = false, $assoc_arr = false, $filter = false ) {
-    return BP_Friends_Friendship::get_friend_user_ids( $user_id, $friend_requests_only, $assoc_arr, $filter );
+}
-function friends_get_friendship_ids( $user_id, $friend_requests_only = false ) {
-    return BP_Friends_Friendship::get_friendship_ids( $user_id, $friend_requests_only );
+}
-function friends_search_friends( $search_terms, $user_id, $pag_num = 10, $pag_page = 1 ) {
-    return BP_Friends_Friendship::search_friends( $search_terms, $user_id, $pag_num, $pag_page );
+}
-function friends_get_friendship_requests( $user_id ) {
-    $fship_ids = friends_get_friendship_ids( $user_id, true );
-    return array( 'requests' => $fship_ids, 'total' => count($fship_ids) );
+}
-function friends_get_recently_active( $user_id, $pag_num = false, $pag_page = false, $filter = false ) {
-    if ( $filter )
-        $friend_ids = friends_search_friends( $filter, $user_id, false );
-    else
-        $friend_ids = friends_get_friend_user_ids( $user_id );
-    if ( !$friend_ids )
-        return false;
-    if ( $filter )
-        $friend_ids = $friend_ids['friends'];
-    $ids_and_activity = friends_get_bulk_last_active( implode( ',', (array)$friend_ids ) );
-    if ( !$ids_and_activity )
-        return false;
-    $total_friends = count( $ids_and_activity );
-    if ( $pag_num && $pag_page )
-        return array( 'friends' => array_slice( $ids_and_activity, intval( ( $pag_page - 1 ) * $pag_num), intval( $pag_num ) ), 'total' => $total_friends );
-    else
-        return array( 'friends' => $ids_and_activity, 'total' => $total_friends );
+}
-function friends_get_alphabetically( $user_id, $pag_num = false, $pag_page = false, $filter = false ) {
-    if ( $filter )
-        $friend_ids = friends_search_friends( $filter, $user_id, false );
-    else
-        $friend_ids = friends_get_friend_user_ids( $user_id );
-    if ( !$friend_ids )
-        return false;
-    if ( $filter )
-        $friend_ids = $friend_ids['friends'];
-    $sorted_ids = BP_Friends_Friendship::sort_by_name( implode( ',', $friend_ids ) );
-    if ( !$sorted_ids )
-        return false;
-    $total_friends = count( $sorted_ids );
-    if ( $pag_num && $pag_page )
-        return array( 'friends' => array_slice( $sorted_ids, intval( ( $pag_page - 1 ) * $pag_num), intval( $pag_num ) ), 'total' => $total_friends );
-    else
-        return array( 'friends' => $sorted_ids, 'total' => $total_friends );
+}
-function friends_get_newest( $user_id, $pag_num = false, $pag_page = false, $filter = false ) {
-    if ( $filter )
-        $friend_ids = friends_search_friends( $filter, $user_id, false );
-    else
-        $friend_ids = friends_get_friend_user_ids( $user_id );
-    if ( !$friend_ids )
-        return false;
-    if ( $filter )
-        $friend_ids = $friend_ids['friends'];
-    $total_friends = count( $friend_ids );
-    if ( $pag_num && $pag_page )
-        return array( 'friends' => array_slice( $friend_ids, intval( ( $pag_page - 1 ) * $pag_num), intval( $pag_num ) ), 'total' => $total_friends );
-    else
-        return array( 'friends' => $friend_ids, 'total' => $total_friends );
+}
-function friends_get_bulk_last_active( $friend_ids ) {
-    return BP_Friends_Friendship::get_bulk_last_active( $friend_ids );
+}
-function friends_get_friends_list( $user_id ) {
-    global $bp;
-    $friend_ids = BP_Friends_Friendship::get_friend_user_ids( $user_id );
-    if ( !$friend_ids )
-        return false;
-    for ( $i = 0; $i < count($friend_ids); $i++ ) {
-        if ( function_exists('bp_user_fullname') )
-            $display_name = bp_core_get_user_displayname( $friend_ids[$i] );
-        if ( $display_name != ' ' ) {
-            $friends[] = array(
-                'id' => $friend_ids[$i],
-                'full_name' => $display_name
-            );
+        }
+    }
-    if ( $friends && is_array($friends) )
-        usort($friends, 'friends_sort_by_name');
-    if ( !$friends )
-        return false;
-    return $friends;
+}
-    function friends_sort_by_name($a, $b) {
-        return strcasecmp($a['full_name'], $b['full_name']);
+    }
-function friends_get_friends_invite_list( $user_id = false, $group_id ) {
-    global $bp;
-    if ( !$user_id )
-        $user_id = $bp->loggedin_user->id;
-    $friend_ids = friends_get_alphabetically( $user_id );
-    if ( (int) $friend_ids['total'] < 1 )
-        return false;
-    for ( $i = 0; $i < count($friend_ids['friends']); $i++ ) {
-        if ( groups_check_user_has_invite( $friend_ids['friends'][$i]->user_id, $group_id ) || groups_is_user_member( $friend_ids['friends'][$i]->user_id, $group_id ) )
-            continue;
-        $display_name = bp_core_get_user_displayname( $friend_ids['friends'][$i]->user_id );
-        if ( $display_name != ' ' ) {
-            $friends[] = array(
-                'id' => $friend_ids['friends'][$i]->user_id,
-                'full_name' => $display_name
-            );
+        }
+    }
-    if ( !$friends )
-        return false;
-    return $friends;
+}
-function friends_count_invitable_friends( $user_id, $group_id ) {
-    return BP_Friends_Friendship::get_invitable_friend_count( $user_id, $group_id );
+}
-function friends_get_friend_count_for_user( $user_id ) {
-    return BP_Friends_Friendship::total_friend_count( $user_id );
+}
-function friends_search_users( $search_terms, $user_id, $pag_num = false, $pag_page = false ) {
-    global $bp;
-    $user_ids = BP_Friends_Friendship::search_users( $search_terms, $user_id, $pag_num, $pag_page );
-    if ( !$user_ids )
-        return false;
-    for ( $i = 0; $i < count($user_ids); $i++ ) {
-        $users[] = new BP_Core_User($user_ids[$i]);
+    }
-    return array( 'users' => $users, 'count' => BP_Friends_Friendship::search_users_count($search_terms) );
+}
-function friends_check_friendship( $user_id, $possible_friend_id ) {
-    global $bp;
-    if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( $user_id, $possible_friend_id ) )
-        return true;
-    return false;
+}
 function friends_add_friend( $initiator_userid, $friend_userid, $force_accept = false ) {
     global $bp;
 …
+}
+function friends_check_friendship( $user_id, $possible_friend_id ) {
+    global $bp;
+    if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( $user_id, $possible_friend_id ) )
+        return true;
+    return false;
+}
+function friends_get_total_friend_count( $user_id = false ) {
+    global $bp;
+    if ( !$user_id )
+        $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+    return apply_filters( 'friends_get_total_friend_count', get_usermeta( $user_id, 'total_friend_count' ) );
+}
+function friends_check_user_has_friends( $user_id ) {
+    $friend_count = friends_get_total_friend_count( $user_id );
+    if ( empty( $friend_count ) )
+        return false;
+    if ( !(int)$friend_count )
+        return false;
+    return true;
+}
+function friends_get_friendship_id( $initiator_user_id, $friend_user_id ) {
+    return BP_Friends_Friendship::get_friendship_id( $initiator_user_id, $friend_user_id );
+}
+function friends_get_friend_user_ids( $user_id, $friend_requests_only = false, $assoc_arr = false, $filter = false ) {
+    return BP_Friends_Friendship::get_friend_user_ids( $user_id, $friend_requests_only, $assoc_arr, $filter );
+}
+function friends_search_friends( $search_terms, $user_id, $pag_num = 10, $pag_page = 1 ) {
+    return BP_Friends_Friendship::search_friends( $search_terms, $user_id, $pag_num, $pag_page );
+}
+function friends_get_friendship_request_user_ids( $user_id ) {
+    return BP_Friends_Friendship::get_friendship_request_user_ids( $user_id );
+}
+function friends_get_recently_active( $user_id, $per_page = false, $page = false, $filter = false ) {
+    return apply_filters( 'friends_get_recently_active', BP_Core_User::get_users( 'active', $per_page, $page, $user_id, $filter ) );
+}
+function friends_get_alphabetically( $user_id, $per_page = false, $page = false, $filter = false ) {
+    return apply_filters( 'friends_get_alphabetically', BP_Core_User::get_users( 'alphabetical', $per_page, $page, $user_id, $filter ) );
+}
+function friends_get_newest( $user_id, $per_page = false, $page = false, $filter = false ) {
+    return apply_filters( 'friends_get_newest', BP_Core_User::get_users( 'newest', $per_page, $page, $user_id, $filter ) );
+}
+function friends_get_bulk_last_active( $friend_ids ) {
+    return BP_Friends_Friendship::get_bulk_last_active( $friend_ids );
+}
+function friends_get_friends_list( $user_id ) {
+    global $bp;
+    $friend_ids = BP_Friends_Friendship::get_friend_user_ids( $user_id );
+    if ( !$friend_ids )
+        return false;
+    for ( $i = 0; $i < count($friend_ids); $i++ ) {
+        if ( function_exists('bp_user_fullname') )
+            $display_name = bp_core_get_user_displayname( $friend_ids[$i] );
+        if ( $display_name != ' ' ) {
+            $friends[] = array(
+                'id' => $friend_ids[$i],
+                'full_name' => $display_name
+            );
+        }
+    }
+    if ( $friends && is_array($friends) )
+        usort($friends, 'friends_sort_by_name');
+    if ( !$friends )
+        return false;
+    return $friends;
+}
+    function friends_sort_by_name($a, $b) {
+        return strcasecmp($a['full_name'], $b['full_name']);
+    }
+function friends_get_friends_invite_list( $user_id = false, $group_id ) {
+    global $bp;
+    if ( !$user_id )
+        $user_id = $bp->loggedin_user->id;
+    $friend_ids = friends_get_alphabetically( $user_id );
+    if ( (int) $friend_ids['total'] < 1 )
+        return false;
+    for ( $i = 0; $i < count($friend_ids['friends']); $i++ ) {
+        if ( groups_check_user_has_invite( $friend_ids['friends'][$i]->user_id, $group_id ) || groups_is_user_member( $friend_ids['friends'][$i]->user_id, $group_id ) )
+            continue;
+        $display_name = bp_core_get_user_displayname( $friend_ids['friends'][$i]->user_id );
+        if ( $display_name != ' ' ) {
+            $friends[] = array(
+                'id' => $friend_ids['friends'][$i]->user_id,
+                'full_name' => $display_name
+            );
+        }
+    }
+    if ( !$friends )
+        return false;
+    return $friends;
+}
+function friends_count_invitable_friends( $user_id, $group_id ) {
+    return BP_Friends_Friendship::get_invitable_friend_count( $user_id, $group_id );
+}
+function friends_get_friend_count_for_user( $user_id ) {
+    return BP_Friends_Friendship::total_friend_count( $user_id );
+}
+function friends_search_users( $search_terms, $user_id, $pag_num = false, $pag_page = false ) {
+    global $bp;
+    $user_ids = BP_Friends_Friendship::search_users( $search_terms, $user_id, $pag_num, $pag_page );
+    if ( !$user_ids )
+        return false;
+    for ( $i = 0; $i < count($user_ids); $i++ ) {
+        $users[] = new BP_Core_User($user_ids[$i]);
+    }
+    return array( 'users' => $users, 'count' => BP_Friends_Friendship::search_users_count($search_terms) );
+}
 function friends_is_friendship_confirmed( $friendship_id ) {
     $friendship = new BP_Friends_Friendship( $friendship_id );
 …
+}
+/**
+ * friends_filter_template_paths()
+ *
+ * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
+ * older than 1.2.
+ *
+ * @package BuddyPress Core
+ */
+function friends_filter_template_paths() {
+    if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+        return false;
+    add_filter( 'friends_template_my_friends', create_function( '', 'return "friends/index";' ) );
+    add_filter( 'friends_template_requests', create_function( '', 'return "friends/requests";' ) );
+}
+add_action( 'init', 'friends_filter_template_paths' );
 function friends_remove_data( $user_id ) {
     BP_Friends_Friendship::delete_all_for_user($user_id);

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

-                      r2114
+                      r2168
+    }
-    function get_friendship_ids( $user_id, $friend_requests_only = false ) {
-        global $wpdb, $bp;
-        if ( $friend_requests_only ) {
-            $oc_sql = $wpdb->prepare( "AND is_confirmed = 0" );
-            $friend_sql = $wpdb->prepare ( " WHERE friend_user_id = %d", $user_id );
-        } else {
-            $oc_sql = $wpdb->prepare( "AND is_confirmed = 1" );
-            $friend_sql = $wpdb->prepare ( " WHERE (initiator_user_id = %d OR friend_user_id = %d)", $user_id, $user_id );
+        }
-        return $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->friends->table_name} $friend_sql $oc_sql" ) );
+    }
     function get_friendship_id( $user_id, $friend_id ) {
         global $wpdb, $bp;
 …
+    }
+    function total_friend_count( $user_id = false) {
+    function get_friendship_request_user_ids( $user_id ) {
+        global $wpdb, $bp;
+        return $wpdb->get_col( $wpdb->prepare( "SELECT initiator_user_id FROM {$bp->friends->table_name} WHERE friend_user_id = %d AND is_confirmed = 0", $user_id ) );
+    }
+    function total_friend_count( $user_id = false ) {
         global $wpdb, $bp;
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
+            $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
         /* This is stored in 'total_friend_count' usermeta.

trunk/bp-friends/bp-friends-templatetags.php

-                      r2128
+                      r2168
 <?php
+class BP_Friendship_Template {
+    var $current_friendship = -1;
+    var $friendship_count;
+    var $friendships;
+    var $friendship;
+    var $in_the_loop;
+    var $pag_page;
+    var $pag_num;
+    var $pag_links;
+    var $total_friend_count;
+    function bp_friendship_template( $user_id, $type, $per_page, $max, $filter ) {
+        global $bp;
+        if ( !$user_id )
+            $user_id = $bp->displayed_user->id;
+        $this->pag_page = isset( $_REQUEST['frpage'] ) ? intval( $_REQUEST['frpage'] ) : 1;
+        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+        $this->type = $type;
+        switch ( $type ) {
+            case 'newest':
+                $this->friendships = friends_get_newest( $user_id, $this->pag_num, $this->pag_page, $filter );
+                break;
+            case 'alphabetical':
+                $this->friendships = friends_get_alphabetically( $user_id, $this->pag_num, $this->pag_page, $filter );
+                break;
+            case 'requests':
+                $this->friendships = friends_get_friendship_requests( $user_id );
+                break;
+            case 'active': default:
+                $this->friendships = friends_get_recently_active( $user_id, $this->pag_num, $this->pag_page, $filter );
+                break;
+        }
+        if ( 'requests' == $type ) {
+            $this->total_friend_count = $this->friendships['total'];
+            $this->friendships = $this->friendships['requests'];
+            $this->friendship_count = count($this->friendships);
+        } else {
+            if ( !$max || $max >= (int)$this->friendships['total'] )
+                $this->total_friend_count = (int)$this->friendships['total'];
+            else
+                $this->total_friend_count = (int)$max;
+            $this->friendships = $this->friendships['friends'];
+            if ( $max ) {
+                if ( $max >= count($this->friendships) )
+                    $this->friendship_count = count($this->friendships);
+                else
+                    $this->friendship_count = (int)$max;
+            } else {
+                $this->friendship_count = count($this->friendships);
+            }
+        }
+        $this->pag_links = paginate_links( array(
+            'base' => add_query_arg( 'frpage', '%#%' ),
+            'format' => '',
+            'total' => ceil($this->total_friend_count / $this->pag_num),
+            'current' => $this->pag_page,
+            'prev_text' => '&laquo;',
+            'next_text' => '&raquo;',
+            'mid_size' => 1
+        ));
+    }
+    function has_friendships() {
+        if ( $this->friendship_count )
+            return true;
+        return false;
+    }
+    function next_friendship() {
+        $this->current_friendship++;
+        $this->friendship = $this->friendships[$this->current_friendship];
+        return $this->friendship;
+    }
+    function rewind_friendships() {
+        $this->current_friendship = -1;
+        if ( $this->friendship_count > 0 ) {
+            $this->friendship = $this->friendships[0];
+        }
+    }
+    function user_friendships() {
+        if ( $this->current_friendship + 1 < $this->friendship_count ) {
+            return true;
+        } elseif ( $this->current_friendship + 1 == $this->friendship_count ) {
+            do_action('loop_end');
+            // Do some cleaning up after the loop
+            $this->rewind_friendships();
+        }
+        $this->in_the_loop = false;
+        return false;
+    }
+    function the_friendship() {
+        global $friendship, $bp;
+        $this->in_the_loop = true;
+        $this->friendship = $this->next_friendship();
+        if ( 'requests' == $this->type ) {
+            $this->friendship = new BP_Friends_Friendship( $this->friendship );
+            $this->friendship->user_id = ( $this->friendship->friend_user_id == $bp->loggedin_user->id ) ?  $this->friendship->initiator_user_id : $this->friendship->friend_user_id;
+        } else {
+            if ( 'newest' == $this->type )
+                $user_id = $this->friendship;
+            else
+                $user_id = $this->friendship->user_id;
+            $this->friendship = new stdClass;
+            if ( !$this->friendship->friend = wp_cache_get( 'bp_user_' . $user_id, 'bp' ) ) {
+                $this->friendship->friend = new BP_Core_User( $user_id );
+                wp_cache_set( 'bp_user_' . $user_id, $this->friendship->friend, 'bp' );
+            }
+            /* Make sure the user_id is available in the friend object. */
+            $this->friendship->friend->user_id = $user_id;
+        }
+        if ( 0 == $this->current_friendship ) // loop has just started
+            do_action('loop_start');
+    }
+}
+function bp_has_friendships( $args = '' ) {
+    global $bp, $friends_template;
+    $defaults = array(
+        'type' => 'active',
+        'user_id' => false,
+        'per_page' => 10,
+        'max' => false,
+        'filter' => false
+    );
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+    /* The following code will auto set parameters based on the page being viewed.
+     * for example on example.com/members/andy/friends/my-friends/newest/
+     * $type = 'newest'
+     */
+    if ( 'my-friends' == $bp->current_action ) {
+        $order = $bp->action_variables[0];
+        if ( 'newest' == $order )
+            $type = 'newest';
+        else if ( 'alphabetically' == $order )
+            $type = 'alphabetical';
+    } else if ( 'requests' == $bp->current_action ) {
+        $type = 'requests';
+    }
+    if ( isset( $_REQUEST['friend-search-box'] ) )
+        $filter = $_REQUEST['friend-search-box'];
+    $friends_template = new BP_Friendship_Template( $user_id, $type, $per_page, $max, $filter );
+    return apply_filters( 'bp_has_friendships', $friends_template->has_friendships(), &$friends_template );
+}
+function bp_the_friendship() {
+    global $friends_template;
+    return $friends_template->the_friendship();
+}
+function bp_user_friendships() {
+    global $friends_template;
+    return $friends_template->user_friendships();
+}
+function bp_friend_id() {
+    echo bp_get_friend_id();
+}
+    function bp_get_friend_id() {
+        global $friends_template;
+        return apply_filters( 'bp_get_friend_id', $friends_template->friendship->friend->user_id );
+    }
+function bp_friend_avatar_thumb( $args = '' ) {
+    echo bp_get_friend_avatar_thumb( $args );
+}
+    function bp_get_friend_avatar_thumb( $args = '' ) {
+        global $bp, $friends_template;
+        $defaults = array(
+            'type' => 'thumb',
+            'width' => false,
+            'height' => false,
+            'class' => 'avatar',
+            'id' => false,
+            'alt' => __( 'Group avatar', 'buddypress' )
+        );
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+        return apply_filters( 'bp_get_friend_avatar_thumb', bp_core_fetch_avatar( array( 'item_id' => $friends_template->friendship->friend->id, 'type' => $type, 'alt' => $alt, 'width' => $width, 'height' => $height, 'class' => $class ) ) );
+    }
+function bp_friend_name() {
+    echo bp_get_friend_name();
+}
+    function bp_get_friend_name() {
+        global $friends_template;
+        return apply_filters( 'bp_get_friend_name', strip_tags( $friends_template->friendship->friend->user_link ) );
+    }
+function bp_friend_link() {
+    echo bp_get_friend_link();
+}
+    function bp_get_friend_link() {
+        global $friends_template;
+        return apply_filters( 'bp_get_friend_link', $friends_template->friendship->friend->user_link );
+    }
+function bp_friend_url() {
+    echo bp_get_friend_url();
+}
+    function bp_get_friend_url() {
+        global $friends_template;
+        return apply_filters( 'bp_get_friend_url', $friends_template->friendship->friend->user_url );
+    }
+function bp_friend_last_active() {
+    echo bp_get_friend_last_active();
+}
+    function bp_get_friend_last_active() {
+        global $friends_template;
+        return apply_filters( 'bp_get_friend_last_active', $friends_template->friendship->friend->last_active );
+    }
+function bp_friend_time_since_requested() {
+    echo bp_get_friend_time_since_requested();
+}
+    function bp_get_friend_time_since_requested() {
+        global $friends_template;
+        if ( $friends_template->friendship->date_created != "0000-00-00 00:00:00" ) {
+            return apply_filters( 'bp_friend_time_since_requested', sprintf( __( 'requested %s ago', 'buddypress' ), bp_core_time_since( strtotime( $friends_template->friendship->date_created ) ) ) );
+        }
+        return false;
+    }
+function bp_friend_accept_request_link() {
+    echo bp_get_friend_accept_request_link();
+}
+    function bp_get_friend_accept_request_link() {
+        global $friends_template, $bp;
+        return apply_filters( 'bp_get_friend_accept_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/accept/' . $friends_template->friendship->id, 'friends_accept_friendship' ) );
+    }
+function bp_friend_reject_request_link() {
+    echo bp_get_friend_reject_request_link();
+}
+    function bp_get_friend_reject_request_link() {
+        global $friends_template, $bp;
+        return apply_filters( 'bp_get_friend_reject_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/reject/' . $friends_template->friendship->id, 'friends_reject_friendship' ) );
+    }
+function bp_friend_pagination() {
+    echo bp_get_friend_pagination();
+}
+    function bp_get_friend_pagination() {
+        global $friends_template;
+        return apply_filters( 'bp_friend_pagination', $friends_template->pag_links );
+    }
+function bp_friend_pagination_count() {
+    global $bp, $friends_template;
+    $from_num = intval( ( $friends_template->pag_page - 1 ) * $friends_template->pag_num ) + 1;
+    $to_num = ( $from_num + ( $friends_template->pag_num - 1 ) > $friends_template->total_friend_count ) ? $friends_template->total_friend_count : $from_num + ( $friends_template->pag_num - 1) ;
+    echo sprintf( __( 'Viewing friend %d to %d (of %d friends)', 'buddypress' ), $from_num, $to_num, $friends_template->total_friend_count ); ?> &nbsp;
+    <span class="ajax-loader"></span><?php
+}
+function bp_friend_total_for_member() {
+    echo bp_get_friend_total_for_member();
+}
+    function bp_get_friend_total_for_member() {
+        return apply_filters( 'bp_get_friend_total_for_member', BP_Friends_Friendship::total_friend_count() );
+    }
+function bp_friend_search_form() {
+    global $friends_template, $bp;
+    $action = $bp->displayed_user->domain . $bp->friends->slug . '/my-friends/search/';
+    $label = __( 'Filter Friends', 'buddypress' );
+?>
+    <form action="<?php echo $action ?>" id="friend-search-form" method="post">
+        <label for="friend-search-box" id="friend-search-label"><?php echo $label ?></label>
+        <input type="search" name="friend-search-box" id="friend-search-box" value="<?php echo $value ?>"<?php echo $disabled ?> />
+        <?php wp_nonce_field( 'friends_search', '_wpnonce_friend_search' ) ?>
+        <input type="hidden" name="initiator" id="initiator" value="<?php echo attribute_escape( $bp->displayed_user->id ) ?>" />
+    </form>
+<?php
+}
+function bp_friends_is_filtered() {
+    if ( isset( $_POST['friend-search-box'] ) )
+        return true;
+    return false;
+}
+function bp_friend_all_friends_link() {
+function bp_friends_header_tabs() {
     global $bp;
-    echo apply_filters( 'bp_friend_all_friends_link', $bp->displayed_user->domain . 'my-friends/all-friends' );
+}
-function bp_friend_latest_update_link() {
-    global $bp;
-    echo apply_filters( 'bp_friend_latest_update_link', $bp->displayed_user->domain . 'my-friends/last-updated' );
+}
-function bp_friend_recent_activity_link() {
-    global $bp;
-    echo apply_filters( 'bp_friend_recent_activity_link', $bp->displayed_user->domain . 'my-friends/recently-active' );
+}
-function bp_friend_recent_status_link() {
-    global $bp;
-    echo apply_filters( 'bp_friend_recent_status_link', $bp->displayed_user->domain . 'my-friends/status-updates' );
+}
-function bp_add_friend_button( $potential_friend_id = false ) {
-    echo bp_get_add_friend_button( $potential_friend_id );
+}
-    function bp_get_add_friend_button( $potential_friend_id = false ) {
-        global $bp, $friends_template;
-        $button = false;
-        if ( is_user_logged_in() ) {
-            if ( !$potential_friend_id && $friends_template->friendship->friend )
-                $potential_friend_id = $friends_template->friendship->friend->id;
-            else if ( !$potential_friend_id && !$friends_template->friendship->friend )
-                $potential_friend_id = $bp->displayed_user->id;
-            if ( $bp->loggedin_user->id == $potential_friend_id )
-                return false;
-            $friend_status = BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $potential_friend_id );
-            $button = '<div class="generic-button friendship-button ' . $friend_status . '" id="friendship-button-' . $potential_friend_id . '">';
-            if ( 'pending' == $friend_status ) {
-                $button .= '<a class="requested" href="' . $bp->loggedin_user->domain . $bp->friends->slug . '">' . __( 'Friendship Requested', 'buddypress' ) . '</a>';
-            } else if ( 'is_friend' == $friend_status ) {
-                $button .= '<a href="' . wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/remove-friend/' . $potential_friend_id, 'friends_remove_friend' ) . '" title="' . __('Cancel Friendship', 'buddypress') . '" id="friend-' . $potential_friend_id . '" rel="remove" class="remove">' . __('Cancel Friendship', 'buddypress') . '</a>';
-            } else {
-                $button .= '<a href="' . wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/add-friend/' . $potential_friend_id, 'friends_add_friend' ) . '" title="' . __('Add Friend', 'buddypress') . '" id="friend-' . $potential_friend_id . '" rel="add" class="add">' . __('Add Friend', 'buddypress') . '</a>';
+            }
-            $button .= '</div>';
+        }
-        return apply_filters( 'bp_get_add_friend_button', $button );
+    }
-function bp_friends_header_tabs() {
-    global $bp, $create_group_step, $completed_to_step;
 ?>
     <li<?php if ( !isset($bp->action_variables[0]) || 'recently-active' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
 …
+}
+function bp_friend_search_form() {
+    global $friends_template, $bp;
+    $action = $bp->displayed_user->domain . $bp->friends->slug . '/my-friends/search/';
+    $label = __( 'Filter Friends', 'buddypress' );
+    ?>
+        <form action="<?php echo $action ?>" id="friend-search-form" method="post">
+        <label for="friend-search-box" id="friend-search-label"><?php echo $label ?></label>
+        <input type="search" name="friend-search-box" id="friend-search-box" value="<?php echo $value ?>"<?php echo $disabled ?> />
+        <?php wp_nonce_field( 'friends_search', '_wpnonce_friend_search' ) ?>
+        <input type="hidden" name="initiator" id="initiator" value="<?php echo attribute_escape( $bp->displayed_user->id ) ?>" />
+        </form>
+    <?php
+}
+function bp_add_friend_button( $potential_friend_id = false ) {
+    echo bp_get_add_friend_button( $potential_friend_id );
+}
+    function bp_get_add_friend_button( $potential_friend_id = false ) {
+        global $bp, $friends_template;
+        $button = false;
+        if ( is_user_logged_in() ) {
+            if ( !$potential_friend_id && $friends_template->friendship->friend )
+                $potential_friend_id = $friends_template->friendship->friend->id;
+            else if ( !$potential_friend_id && !$friends_template->friendship->friend )
+                $potential_friend_id = $bp->displayed_user->id;
+            if ( $bp->loggedin_user->id == $potential_friend_id )
+                return false;
+            $friend_status = BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $potential_friend_id );
+            $button = '<div class="generic-button friendship-button ' . $friend_status . '" id="friendship-button-' . $potential_friend_id . '">';
+            if ( 'pending' == $friend_status ) {
+                $button .= '<a class="requested" href="' . $bp->loggedin_user->domain . $bp->friends->slug . '">' . __( 'Friendship Requested', 'buddypress' ) . '</a>';
+            } else if ( 'is_friend' == $friend_status ) {
+                $button .= '<a href="' . wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/remove-friend/' . $potential_friend_id, 'friends_remove_friend' ) . '" title="' . __('Cancel Friendship', 'buddypress') . '" id="friend-' . $potential_friend_id . '" rel="remove" class="remove">' . __('Cancel Friendship', 'buddypress') . '</a>';
+            } else {
+                $button .= '<a href="' . wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/add-friend/' . $potential_friend_id, 'friends_add_friend' ) . '" title="' . __('Add Friend', 'buddypress') . '" id="friend-' . $potential_friend_id . '" rel="add" class="add">' . __('Add Friend', 'buddypress') . '</a>';
+            }
+            $button .= '</div>';
+        }
+        return apply_filters( 'bp_get_add_friend_button', $button );
+    }
+function bp_get_friend_ids( $user_id = false ) {
+    global $bp;
+    if ( !$user_id )
+        $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+    return implode( ',', friends_get_friend_user_ids( $user_id ) );
+}
+function bp_get_friendship_requests() {
+    global $bp;
+    return apply_filters( 'bp_get_friendship_requests', implode( ',', (array) friends_get_friendship_request_user_ids( $bp->loggedin_user->id ) ) );
+}
+function bp_friend_accept_request_link() {
+    echo bp_get_friend_accept_request_link();
+}
+    // You only have the user ID but you need the friendship ID !!
+    function bp_get_friend_accept_request_link() {
+        global $members_template, $bp;
+        if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id ) ) {
+            $friendship_id = friends_get_friendship_id( $members_template->member->id, $bp->loggedin_user->id );
+            wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id, $friendship_id, 'bp' );
+        }
+        return apply_filters( 'bp_get_friend_accept_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/accept/' . $friendship_id, 'friends_accept_friendship' ) );
+    }
+function bp_friend_reject_request_link() {
+    echo bp_get_friend_reject_request_link();
+}
+    function bp_get_friend_reject_request_link() {
+        global $members_template, $bp;
+        if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id ) ) {
+            $friendship_id = friends_get_friendship_id( $members_template->member->id, $bp->loggedin_user->id );
+            wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id, $friendship_id, 'bp' );
+        }
+        return apply_filters( 'bp_get_friend_reject_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/reject/' . $friendship_id, 'friends_reject_friendship' ) );
+    }
 ?>

trunk/bp-groups.php

-                      r2158
+                      r2168
 require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-widgets.php' );
 require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-filters.php' );
-/* Include deprecated functions if settings allow */
-if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-    require ( BP_PLUGIN_DIR . '/bp-groups/deprecated/bp-groups-deprecated.php' );
 function groups_install() {
 …
     $bp->groups->group_creation_steps = apply_filters( 'groups_create_group_steps', array(
         'group-details' => array( 'name' => __( 'Group Details', 'buddypress' ), 'position' => 0 ),
         'group-settings' => array( 'name' => __( 'Group Settings', 'buddypress' ), 'position' => 10 ),
         'group-avatar' => array( 'name' => __( 'Group Avatar', 'buddypress' ), 'position' => 20 ),
         'group-invites' => array( 'name' => __( 'Group Invites', 'buddypress' ), 'position' => 30 )
+        'group-details' => array( 'name' => __( 'Details', 'buddypress' ), 'position' => 0 ),
+        'group-settings' => array( 'name' => __( 'Settings', 'buddypress' ), 'position' => 10 ),
+        'group-avatar' => array( 'name' => __( 'Avatar', 'buddypress' ), 'position' => 20 ),
+        'group-invites' => array( 'name' => __( 'Invites', 'buddypress' ), 'position' => 30 )
     ) );
 …
     /* Add 'Groups' to the main navigation */
     bp_core_new_nav_item( array( 'name' => __('Groups', 'buddypress'), 'slug' => $bp->groups->slug, 'position' => 70, 'screen_function' => 'groups_screen_my_groups', 'default_subnav_slug' => 'my-groups', 'item_css_id' => $bp->groups->id ) );
+    bp_core_new_nav_item( array( 'name' => sprintf( __( 'Groups (%d)', 'buddypress' ), groups_total_groups_for_user() ), 'slug' => $bp->groups->slug, 'position' => 70, 'screen_function' => 'groups_screen_my_groups', 'default_subnav_slug' => 'my-groups', 'item_css_id' => $bp->groups->id ) );
     $groups_link = $bp->loggedin_user->domain . $bp->groups->slug . '/';
 …
     /* Add the subnav items to the groups nav item */
     bp_core_new_subnav_item( array( 'name' => __( 'My Groups', 'buddypress' ), 'slug' => 'my-groups', 'parent_url' => $groups_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_my_groups', 'position' => 10, 'item_css_id' => 'groups-my-groups' ) );
-    bp_core_new_subnav_item( array( 'name' => __( 'Create a Group', 'buddypress' ), 'slug' => 'create', 'parent_url' => $groups_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_create_group', 'position' => 20, 'user_has_access' => bp_is_home() ) );
     bp_core_new_subnav_item( array( 'name' => __( 'Invites', 'buddypress' ), 'slug' => 'invites', 'parent_url' => $groups_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_invites', 'position' => 30, 'user_has_access' => bp_is_home() ) );
 …
                     bp_core_new_subnav_item( array( 'name' => __( 'Send Invites', 'buddypress' ), 'slug' => 'send-invites', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_invite', 'item_css_id' => 'group-invite', 'position' => 70, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
                 bp_core_new_subnav_item( array( 'name' => __( 'Leave Group', 'buddypress' ), 'slug' => 'leave-group', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_leave', 'item_css_id' => 'group-leave', 'position' => 110, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
+                //bp_core_new_subnav_item( array( 'name' => __( 'Leave Group', 'buddypress' ), 'slug' => 'leave-group', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_leave', 'item_css_id' => 'group-leave', 'position' => 110, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
+            }
+        }
 …
         do_action( 'groups_directory_groups_setup' );
         bp_core_load_template( apply_filters( 'groups_template_directory_groups', 'directories/groups/index' ) );
+        bp_core_load_template( apply_filters( 'groups_template_directory_groups', 'groups/index' ) );
+    }
+}
 …
     do_action( 'groups_screen_my_groups' );
     bp_core_load_template( apply_filters( 'groups_template_my_groups', 'groups/index' ) );
+    bp_core_load_template( apply_filters( 'groups_template_my_groups', 'members/single/groups' ) );
+}
 …
     do_action( 'groups_screen_group_invites', $group_id );
+    if ( '' != locate_template( array( 'groups/invites.php' ), false ) )
+        bp_core_load_template( apply_filters( 'groups_template_group_invites', 'groups/invites' ) );
+    else
+        bp_core_load_template( apply_filters( 'groups_template_group_invites', 'groups/list-invites' ) );
+}
+function groups_screen_create_group() {
+    global $bp;
+    /* If no current step is set, reset everything so we can start a fresh group creation */
+    if ( !$bp->groups->current_create_step = $bp->action_variables[1] ) {
+        unset( $bp->groups->current_create_step );
+        unset( $bp->groups->completed_create_steps );
+        setcookie( 'bp_new_group_id', false, time() - 1000, COOKIEPATH );
+        setcookie( 'bp_completed_create_steps', false, time() - 1000, COOKIEPATH );
+        $reset_steps = true;
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . array_shift( array_keys( $bp->groups->group_creation_steps )  ) );
+    }
+    /* If this is a creation step that is not recognized, just redirect them back to the first screen */
+    if ( $bp->action_variables[1] && !$bp->groups->group_creation_steps[$bp->action_variables[1]] ) {
+        bp_core_add_message( __('There was an error saving group details. Please try again.', 'buddypress'), 'error' );
+        bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create' );
+    }
+    /* Fetch the currently completed steps variable */
+    if ( isset( $_COOKIE['bp_completed_create_steps'] ) && !$reset_steps )
+        $bp->groups->completed_create_steps = unserialize( stripslashes( $_COOKIE['bp_completed_create_steps'] ) );
+    /* Set the ID of the new group, if it has already been created in a previous step */
+    if ( isset( $_COOKIE['bp_new_group_id'] ) ) {
+        $bp->groups->new_group_id = $_COOKIE['bp_new_group_id'];
+        $bp->groups->current_group = new BP_Groups_Group( $bp->groups->new_group_id, false, false );
+    }
+    /* If the save, upload or skip button is hit, lets calculate what we need to save */
+    if ( isset( $_POST['save'] ) ) {
+        /* Check the nonce */
+        check_admin_referer( 'groups_create_save_' . $bp->groups->current_create_step );
+        if ( 'group-details' == $bp->groups->current_create_step ) {
+            if ( empty( $_POST['group-name'] ) || empty( $_POST['group-desc'] ) ) {
+                bp_core_add_message( __( 'Please fill in all of the required fields', 'buddypress' ), 'error' );
+                bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step );
+            }
+            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'news' => $_POST['group-news'], 'slug' => groups_check_slug( sanitize_title($_POST['group-name']) ), 'date_created' => time() ) ) ) {
+                bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
+                bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step );
+            }
+            groups_update_groupmeta( $bp->groups->new_group_id, 'total_member_count', 1 );
+            groups_update_groupmeta( $bp->groups->new_group_id, 'last_activity', time() );
+            groups_update_groupmeta( $bp->groups->new_group_id, 'theme', 'buddypress' );
+            groups_update_groupmeta( $bp->groups->new_group_id, 'stylesheet', 'buddypress' );
+        }
+        if ( 'group-settings' == $bp->groups->current_create_step ) {
+            $group_status = 'public';
+            $group_enable_wire = 1;
+            $group_enable_forum = 1;
+            if ( !isset($_POST['group-show-wire']) )
+                $group_enable_wire = 0;
+            if ( !isset($_POST['group-show-forum']) ) {
+                $group_enable_forum = 0;
+            } else {
+                /* Create the forum if enable_forum = 1 */
+                if ( function_exists( 'bp_forums_setup' ) && '' == groups_get_groupmeta( $bp->groups->new_group_id, 'forum_id' ) ) {
+                    groups_new_group_forum();
+                }
+            }
+            if ( 'private' == $_POST['group-status'] )
+                $group_status = 'private';
+            else if ( 'hidden' == $_POST['group-status'] )
+                $group_status = 'hidden';
+            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_wire' => $group_enable_wire, 'enable_forum' => $group_enable_forum ) ) ) {
+                bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
+                bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step );
+            }
+        }
+        if ( 'group-invites' == $bp->groups->current_create_step ) {
+            groups_send_invites( $bp->groups->new_group_id, $bp->loggedin_user->id );
+        }
+        do_action( 'groups_create_group_step_save_' . $bp->groups->current_create_step );
+        do_action( 'groups_create_group_step_complete' ); // Mostly for clearing cache on a generic action name
+        /**
+         * Once we have successfully saved the details for this step of the creation process
+         * we need to add the current step to the array of completed steps, then update the cookies
+         * holding the information
+         */
+        if ( !in_array( $bp->groups->current_create_step, (array)$bp->groups->completed_create_steps ) )
+            $bp->groups->completed_create_steps[] = $bp->groups->current_create_step;
+        /* Reset cookie info */
+        setcookie( 'bp_new_group_id', $bp->groups->new_group_id, time()+60*60*24, COOKIEPATH );
+        setcookie( 'bp_completed_create_steps', serialize( $bp->groups->completed_create_steps ), time()+60*60*24, COOKIEPATH );
+        /* If we have completed all steps and hit done on the final step we can redirect to the completed group */
+        if ( count( $bp->groups->completed_create_steps ) == count( $bp->groups->group_creation_steps ) && $bp->groups->current_create_step == array_pop( array_keys( $bp->groups->group_creation_steps ) ) ) {
+            unset( $bp->groups->current_create_step );
+            unset( $bp->groups->completed_create_steps );
+            /* Once we compelete all steps, record the group creation in the activity stream. */
+            groups_record_activity( array(
+                'content' => apply_filters( 'groups_activity_created_group', sprintf( __( '%s created the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),
+                'primary_link' => apply_filters( 'groups_activity_created_group_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
+                'component_action' => 'created_group',
+                'item_id' => $bp->groups->new_group_id
+            ) );
+            do_action( 'groups_group_create_complete', $bp->groups->new_group_id );
+            bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+        } else {
+            /**
+             * Since we don't know what the next step is going to be (any plugin can insert steps)
+             * we need to loop the step array and fetch the next step that way.
+             */
+            foreach ( $bp->groups->group_creation_steps as $key => $value ) {
+                if ( $key == $bp->groups->current_create_step ) {
+                    $next = 1;
+                    continue;
+                }
+                if ( $next ) {
+                    $next_step = $key;
+                    break;
+                }
+            }
+            bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $next_step );
+        }
+    }
+    /* Group avatar is handled separately */
+    if ( 'group-avatar' == $bp->groups->current_create_step && isset( $_POST['upload'] ) ) {
+        if ( !empty( $_FILES ) && isset( $_POST['upload'] ) ) {
+            /* Normally we would check a nonce here, but the group save nonce is used instead */
+            /* Pass the file to the avatar upload handler */
+            if ( bp_core_avatar_handle_upload( $_FILES, 'groups_avatar_upload_dir' ) ) {
+                $bp->avatar_admin->step = 'crop-image';
+                /* Make sure we include the jQuery jCrop file for image cropping */
+                add_action( 'wp', 'bp_core_add_jquery_cropper' );
+            }
+        }
+        /* If the image cropping is done, crop the image and save a full/thumb version */
+        if ( isset( $_POST['avatar-crop-submit'] ) && isset( $_POST['upload'] ) ) {
+            /* Normally we would check a nonce here, but the group save nonce is used instead */
+            if ( !bp_core_avatar_handle_crop( array( 'object' => 'group', 'avatar_dir' => 'group-avatars', 'item_id' => $bp->groups->current_group->id, 'original_file' => $_POST['image_src'], 'crop_x' => $_POST['x'], 'crop_y' => $_POST['y'], 'crop_w' => $_POST['w'], 'crop_h' => $_POST['h'] ) ) )
+                bp_core_add_message( __( 'There was an error saving the group avatar, please try uploading again.', 'buddypress' ), 'error' );
+            else
+                bp_core_add_message( __( 'The group avatar was uploaded successfully!', 'buddypress' ) );
+        }
+    }
+    bp_core_load_template( apply_filters( 'groups_template_create_group', 'groups/create' ) );
+    bp_core_load_template( apply_filters( 'groups_template_group_invites', 'members/single/groups' ) );
+}
 …
         do_action( 'groups_screen_group_home' );
+        if ( '' != locate_template( array( 'groups/single/home.php' ), false ) )
+            bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+        else
+            bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/group-home' ) );
+        bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+    }
+}
 …
+                }
                 bp_core_load_template( apply_filters( 'groups_template_group_forum_topic_edit', 'groups/single/forum/edit' ) );
+                bp_core_load_template( apply_filters( 'groups_template_group_forum_topic_edit', 'groups/single/home' ) );
+            }
 …
+                }
                 bp_core_load_template( apply_filters( 'groups_template_group_forum_topic_edit', 'groups/single/forum/edit' ) );
+                bp_core_load_template( apply_filters( 'groups_template_group_forum_topic_edit', 'groups/single/home' ) );
+            }
             /* Standard topic display */
             else {
+                if ( '' != locate_template( array( 'groups/single/forum/topic.php' ), false ) )
+                    bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/single/forum/topic' ) );
+                else
+                    bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/forum/topic' ) );
+                bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/single/home' ) );
+            }
 …
             do_action( 'groups_screen_group_forum', $topic_id, $forum_id );
+            if ( '' != locate_template( array( 'groups/single/forum/index.php' ), false ) )
+                bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/single/forum/index' ) );
+            else
+                bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/forum/index' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/single/home' ) );
+        }
+    }
 …
         } else if ( ( !$wire_action || 'latest' == $bp->action_variables[1] ) ) {
+            if ( '' != locate_template( array( 'groups/single/wire.php' ), false ) )
+                bp_core_load_template( apply_filters( 'groups_template_group_wire', 'groups/single/wire' ) );
+            else
+                bp_core_load_template( apply_filters( 'groups_template_group_wire', 'groups/wire' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_wire', 'groups/single/wire' ) );
         } else {
+            if ( '' != locate_template( array( 'groups/single/home.php' ), false ) )
+                bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+            else
+                bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/group-home' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+        }
+    }
 …
     if ( $bp->is_single_item ) {
         do_action( 'groups_screen_group_members', $bp->groups->current_group->id );
+        if ( '' != locate_template( array( 'groups/single/members.php' ), false ) )
+            bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/single/members' ) );
+        else
+            bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/list-members' ) );
+        bp_core_load_template( apply_filters( 'groups_screen_group_members', 'groups/single/home' ) );
+    }
+}
 …
         } else {
             // Show send invite page
+            if ( '' != locate_template( array( 'groups/single/send-invite.php' ), false ) )
+                bp_core_load_template( apply_filters( 'groups_template_group_invite', 'groups/single/send-invite' ) );
+            else
+                bp_core_load_template( apply_filters( 'groups_template_group_invite', 'groups/send-invite' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_invite', 'groups/single/home' ) );
+        }
+    }
 …
             // Show leave group page
+            if ( '' != locate_template( array( 'groups/single/leave-confirm.php' ), false ) )
+                bp_core_load_template( apply_filters( 'groups_template_group_leave', 'groups/single/leave-confirm' ) );
+            else
+                bp_core_load_template( apply_filters( 'groups_template_group_leave', 'groups/leave-group-confirm' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_leave', 'groups/single/home' ) );
+        }
+    }
 …
         do_action( 'groups_screen_group_request_membership', $bp->groups->current_group->id );
+        if ( '' != locate_template( array( 'groups/single/request-membership.php' ), false ) )
+            bp_core_load_template( apply_filters( 'groups_template_group_request_membership', 'groups/single/request-membership' ) );
+        else
+            bp_core_load_template( apply_filters( 'groups_template_group_request_membership', 'groups/request-membership' ) );
+        bp_core_load_template( apply_filters( 'groups_template_group_request_membership', 'groups/single/home' ) );
+    }
+}
 …
         return false;
+    if ( '' != locate_template( array( 'groups/single/home.php' ), false ) )
+        bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+    else
+        bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/group-home' ) );
+    bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+}
 add_action( 'wp', 'groups_screen_group_activity_permalink', 3 );
 …
             do_action( 'groups_screen_group_admin_edit_details', $bp->groups->current_group->id );
+            if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
+                bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/single/admin' ) );
+            else
+                bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/admin/edit-details' ) );
+            bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/single/home' ) );
+        }
+    }
 …
         do_action( 'groups_screen_group_admin_settings', $bp->groups->current_group->id );
+        if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_settings', 'groups/single/admin' ) );
+        else
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_settings', 'groups/admin/group-settings' ) );
+        bp_core_load_template( apply_filters( 'groups_template_group_admin_settings', 'groups/single/home' ) );
+    }
+}
 …
         do_action( 'groups_screen_group_admin_avatar', $bp->groups->current_group->id );
+        if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_avatar', 'groups/single/admin' ) );
+        else
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_avatar', 'groups/admin/group-avatar' ) );
+        bp_core_load_template( apply_filters( 'groups_template_group_admin_avatar', 'groups/single/home' ) );
+    }
+}
 …
         do_action( 'groups_screen_group_admin_manage_members', $bp->groups->current_group->id );
+        if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_manage_members', 'groups/single/admin' ) );
+        else
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_manage_members', 'groups/admin/manage-members' ) );
+        bp_core_load_template( apply_filters( 'groups_template_group_admin_manage_members', 'groups/single/home' ) );
+    }
+}
 …
         do_action( 'groups_screen_group_admin_requests', $bp->groups->current_group->id );
+        if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_requests', 'groups/single/admin' ) );
+        else
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_requests', 'groups/admin/membership-requests' ) );
+        bp_core_load_template( apply_filters( 'groups_template_group_admin_requests', 'groups/single/home' ) );
+    }
+}
 …
         do_action( 'groups_screen_group_admin_delete_group', $bp->groups->current_group->id );
+        if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_delete_group', 'groups/single/admin' ) );
+        else
+            bp_core_load_template( apply_filters( 'groups_template_group_admin_delete_group', 'groups/admin/delete-group' ) );
+        bp_core_load_template( apply_filters( 'groups_template_group_admin_delete_group', 'groups/single/home' ) );
+    }
+}
 …
  */
+function groups_action_create_group() {
+    global $bp;
+    /* If we're not at domain.org/groups/create/ then return false */
+    if ( $bp->current_component != $bp->groups->slug || 'create' != $bp->current_action )
+        return false;
+    if ( !is_user_logged_in() )
+        return false;
+    /* Make sure creation steps are in the right order */
+    groups_action_sort_creation_steps();
+    /* If no current step is set, reset everything so we can start a fresh group creation */
+    if ( !$bp->groups->current_create_step = $bp->action_variables[1] ) {
+        unset( $bp->groups->current_create_step );
+        unset( $bp->groups->completed_create_steps );
+        setcookie( 'bp_new_group_id', false, time() - 1000, COOKIEPATH );
+        setcookie( 'bp_completed_create_steps', false, time() - 1000, COOKIEPATH );
+        $reset_steps = true;
+        bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . array_shift( array_keys( $bp->groups->group_creation_steps ) ) . '/' );
+    }
+    /* If this is a creation step that is not recognized, just redirect them back to the first screen */
+    if ( $bp->action_variables[1] && !$bp->groups->group_creation_steps[$bp->action_variables[1]] ) {
+        bp_core_add_message( __('There was an error saving group details. Please try again.', 'buddypress'), 'error' );
+        bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/' );
+    }
+    /* Fetch the currently completed steps variable */
+    if ( isset( $_COOKIE['bp_completed_create_steps'] ) && !$reset_steps )
+        $bp->groups->completed_create_steps = unserialize( stripslashes( $_COOKIE['bp_completed_create_steps'] ) );
+    /* Set the ID of the new group, if it has already been created in a previous step */
+    if ( isset( $_COOKIE['bp_new_group_id'] ) ) {
+        $bp->groups->new_group_id = $_COOKIE['bp_new_group_id'];
+        $bp->groups->current_group = new BP_Groups_Group( $bp->groups->new_group_id, false, false );
+    }
+    /* If the save, upload or skip button is hit, lets calculate what we need to save */
+    if ( isset( $_POST['save'] ) ) {
+        /* Check the nonce */
+        check_admin_referer( 'groups_create_save_' . $bp->groups->current_create_step );
+        if ( 'group-details' == $bp->groups->current_create_step ) {
+            if ( empty( $_POST['group-name'] ) || empty( $_POST['group-desc'] ) ) {
+                bp_core_add_message( __( 'Please fill in all of the required fields', 'buddypress' ), 'error' );
+                bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
+            }
+            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'news' => $_POST['group-news'], 'slug' => groups_check_slug( sanitize_title($_POST['group-name']) ), 'date_created' => time() ) ) ) {
+                bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
+                bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
+            }
+            groups_update_groupmeta( $bp->groups->new_group_id, 'total_member_count', 1 );
+            groups_update_groupmeta( $bp->groups->new_group_id, 'last_activity', time() );
+        }
+        if ( 'group-settings' == $bp->groups->current_create_step ) {
+            $group_status = 'public';
+            $group_enable_wire = 1;
+            $group_enable_forum = 1;
+            if ( !isset($_POST['group-show-wire']) )
+                $group_enable_wire = 0;
+            if ( !isset($_POST['group-show-forum']) ) {
+                $group_enable_forum = 0;
+            } else {
+                /* Create the forum if enable_forum = 1 */
+                if ( function_exists( 'bp_forums_setup' ) && '' == groups_get_groupmeta( $bp->groups->new_group_id, 'forum_id' ) ) {
+                    groups_new_group_forum();
+                }
+            }
+            if ( 'private' == $_POST['group-status'] )
+                $group_status = 'private';
+            else if ( 'hidden' == $_POST['group-status'] )
+                $group_status = 'hidden';
+            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_wire' => $group_enable_wire, 'enable_forum' => $group_enable_forum ) ) ) {
+                bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
+                bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
+            }
+        }
+        if ( 'group-invites' == $bp->groups->current_create_step ) {
+            groups_send_invites( $bp->groups->new_group_id, $bp->loggedin_user->id );
+        }
+        do_action( 'groups_create_group_step_save_' . $bp->groups->current_create_step );
+        do_action( 'groups_create_group_step_complete' ); // Mostly for clearing cache on a generic action name
+        /**
+         * Once we have successfully saved the details for this step of the creation process
+         * we need to add the current step to the array of completed steps, then update the cookies
+         * holding the information
+         */
+        if ( !in_array( $bp->groups->current_create_step, (array)$bp->groups->completed_create_steps ) )
+            $bp->groups->completed_create_steps[] = $bp->groups->current_create_step;
+        /* Reset cookie info */
+        setcookie( 'bp_new_group_id', $bp->groups->new_group_id, time()+60*60*24, COOKIEPATH );
+        setcookie( 'bp_completed_create_steps', serialize( $bp->groups->completed_create_steps ), time()+60*60*24, COOKIEPATH );
+        /* If we have completed all steps and hit done on the final step we can redirect to the completed group */
+        if ( count( $bp->groups->completed_create_steps ) == count( $bp->groups->group_creation_steps ) && $bp->groups->current_create_step == array_pop( array_keys( $bp->groups->group_creation_steps ) ) ) {
+            unset( $bp->groups->current_create_step );
+            unset( $bp->groups->completed_create_steps );
+            /* Once we compelete all steps, record the group creation in the activity stream. */
+            groups_record_activity( array(
+                'content' => apply_filters( 'groups_activity_created_group', sprintf( __( '%s created the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),
+                'primary_link' => apply_filters( 'groups_activity_created_group_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
+                'component_action' => 'created_group',
+                'item_id' => $bp->groups->new_group_id
+            ) );
+            do_action( 'groups_group_create_complete', $bp->groups->new_group_id );
+            bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+        } else {
+            /**
+             * Since we don't know what the next step is going to be (any plugin can insert steps)
+             * we need to loop the step array and fetch the next step that way.
+             */
+            foreach ( $bp->groups->group_creation_steps as $key => $value ) {
+                if ( $key == $bp->groups->current_create_step ) {
+                    $next = 1;
+                    continue;
+                }
+                if ( $next ) {
+                    $next_step = $key;
+                    break;
+                }
+            }
+            bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $next_step . '/' );
+        }
+    }
+    /* Group avatar is handled separately */
+    if ( 'group-avatar' == $bp->groups->current_create_step && isset( $_POST['upload'] ) ) {
+        if ( !empty( $_FILES ) && isset( $_POST['upload'] ) ) {
+            /* Normally we would check a nonce here, but the group save nonce is used instead */
+            /* Pass the file to the avatar upload handler */
+            if ( bp_core_avatar_handle_upload( $_FILES, 'groups_avatar_upload_dir' ) ) {
+                $bp->avatar_admin->step = 'crop-image';
+                /* Make sure we include the jQuery jCrop file for image cropping */
+                add_action( 'wp', 'bp_core_add_jquery_cropper' );
+            }
+        }
+        /* If the image cropping is done, crop the image and save a full/thumb version */
+        if ( isset( $_POST['avatar-crop-submit'] ) && isset( $_POST['upload'] ) ) {
+            /* Normally we would check a nonce here, but the group save nonce is used instead */
+            if ( !bp_core_avatar_handle_crop( array( 'object' => 'group', 'avatar_dir' => 'group-avatars', 'item_id' => $bp->groups->current_group->id, 'original_file' => $_POST['image_src'], 'crop_x' => $_POST['x'], 'crop_y' => $_POST['y'], 'crop_w' => $_POST['w'], 'crop_h' => $_POST['h'] ) ) )
+                bp_core_add_message( __( 'There was an error saving the group avatar, please try uploading again.', 'buddypress' ), 'error' );
+            else
+                bp_core_add_message( __( 'The group avatar was uploaded successfully!', 'buddypress' ) );
+        }
+    }
+    bp_core_load_template( apply_filters( 'groups_template_create_group', 'groups/create' ) );
+}
+add_action( 'wp', 'groups_action_create_group', 3 );
 function groups_action_join_group() {
     global $bp;
 …
+    }
+    if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) )
+        bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+    else
+        bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/group-home' ) );
+    bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+}
 add_action( 'wp', 'groups_action_join_group', 3 );
 …
         $bp->groups->group_creation_steps[$step['slug']] = array( 'name' => $step['name'], 'position' => $position );
+}
+add_action( 'wp', 'groups_action_sort_creation_steps', 3 );
+function groups_aciton_redirect_to_random_group() {
+function groups_action_redirect_to_random_group() {
     global $bp, $wpdb;
 …
+    }
+}
 add_action( 'wp', 'groups_aciton_redirect_to_random_group', 6 );
+add_action( 'wp', 'groups_action_redirect_to_random_group', 6 );
 …
+}
+function groups_get_newest( $limit = null, $page = 1 ) {
+    return BP_Groups_Group::get_newest( $limit, $page );
+}
+function groups_get_active( $limit = null, $page = 1 ) {
+    return BP_Groups_Group::get_active( $limit, $page );
+}
+function groups_get_popular( $limit = null, $page = 1 ) {
+    return BP_Groups_Group::get_popular( $limit, $page );
+}
+function groups_get_random_groups( $limit = null, $page = 1 ) {
+    return BP_Groups_Group::get_random( $limit, $page );
+}
+function groups_get_alphabetically( $limit = null, $page = 1 ) {
+    return BP_Groups_Group::get_alphabetically( $limit, $page );
+}
+function groups_get_by_most_forum_topics( $limit = null, $page = 1 ) {
+    return BP_Groups_Group::get_by_most_forum_topics( $limit, $page );
+}
+function groups_get_by_most_forum_posts( $limit = null, $page = 1 ) {
+    return BP_Groups_Group::get_by_most_forum_posts( $limit, $page );
+}
+/* TODO: These user group functions could be merged with the above with an optional user ID param */
+/***
+ * All of the following get_() functions will return groups for the site globally.
+ * If you pass a $user_id then the groups will be restricted to only those that the
+ * user has joined.
+ */
+function groups_get_newest( $limit = null, $page = 1, $user_id = false, $search_terms = false ) {
+    return BP_Groups_Group::get_newest( $limit, $page, $user_id, $search_terms );
+}
+function groups_get_active( $limit = null, $page = 1, $user_id = false, $search_terms = false ) {
+    return BP_Groups_Group::get_active( $limit, $page, $user_id, $search_terms );
+}
+function groups_get_popular( $limit = null, $page = 1, $user_id = false, $search_terms = false ) {
+    return BP_Groups_Group::get_popular( $limit, $page, $user_id, $search_terms );
+}
+function groups_get_random_groups( $limit = null, $page = 1, $user_id = false, $search_terms = false ) {
+    return BP_Groups_Group::get_random( $limit, $page, $user_id, $search_terms );
+}
+function groups_get_alphabetically( $limit = null, $page = 1, $user_id = false, $search_terms = false ) {
+    return BP_Groups_Group::get_alphabetically( $limit, $page, $user_id, $search_terms );
+}
+function groups_get_by_most_forum_topics( $limit = null, $page = 1, $user_id = false, $search_terms = false ) {
+    return BP_Groups_Group::get_by_most_forum_topics( $limit, $page, $user_id, $search_terms );
+}
+function groups_get_by_most_forum_posts( $limit = null, $page = 1, $user_id = false, $search_terms = false ) {
+    return BP_Groups_Group::get_by_most_forum_posts( $limit, $page, $user_id, $search_terms );
+}
+function groups_get_total_group_count() {
+    return BP_Groups_Group::get_total_group_count();
+}
 function groups_get_user_groups( $user_id = false, $pag_num = false, $pag_page = false ) {
 …
+}
 function groups_get_most_popular_for_user( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
+function groups_get_user_is_admin_of( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
     global $bp;
 …
         $user_id = $bp->displayed_user->id;
     return BP_Groups_Member::get_most_popular( $user_id, $pag_num, $pag_page, $filter );
+}
 function groups_get_recently_active_for_user( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
+    return BP_Groups_Member::get_is_admin_of( $user_id, $pag_num, $pag_page, $filter );
+}
+function groups_get_user_is_mod_of( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
     global $bp;
 …
         $user_id = $bp->displayed_user->id;
     return BP_Groups_Member::get_recently_active( $user_id, $pag_num, $pag_page, $filter );
+}
 function groups_get_alphabetically_for_user( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
+    return BP_Groups_Member::get_is_mod_of( $user_id, $pag_num, $pag_page, $filter );
+}
+function groups_total_groups_for_user( $user_id = false ) {
     global $bp;
     if ( !$user_id )
+        $user_id = $bp->displayed_user->id;
+    return BP_Groups_Member::get_alphabetically( $user_id, $pag_num, $pag_page, $filter );
+}
+function groups_get_user_is_admin_of( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
+    global $bp;
+    if ( !$user_id )
+        $user_id = $bp->displayed_user->id;
+    return BP_Groups_Member::get_is_admin_of( $user_id, $pag_num, $pag_page, $filter );
+}
+function groups_get_user_is_mod_of( $user_id = false, $pag_num = false, $pag_page = false, $filter = false ) {
+    global $bp;
+    if ( !$user_id )
+        $user_id = $bp->displayed_user->id;
+    return BP_Groups_Member::get_is_mod_of( $user_id, $pag_num, $pag_page, $filter );
+}
+function groups_total_groups_for_user( $user_id = false ) {
+    global $bp;
+    if ( !$user_id )
+        $user_id = $bp->displayed_user->id;
+        $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
     return BP_Groups_Member::total_group_count( $user_id );
+}
-function groups_get_random_groups_for_user( $user_id = false, $total_groups = 5 ) {
-    global $bp;
-    if ( !$user_id )
-        $user_id = $bp->displayed_user->id;
-    return BP_Groups_Member::get_random_groups( $user_id, $total_groups );
+}
 …
 /*** Group Cleanup Functions ****************************************************/
+/**
+ * groups_filter_template_paths()
+ *
+ * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
+ * older than 1.2.
+ *
+ * @package BuddyPress Core
+ */
+function groups_filter_template_paths() {
+    if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+        return false;
+    add_filter( 'groups_template_directory_groups', create_function( '', 'return "directories/groups/index";' ) );
+    add_filter( 'groups_template_my_groups', create_function( '', 'return "groups/index";' ) );
+    add_filter( 'groups_template_group_invites', create_function( '', 'return "groups/invites";' ) );
+    add_filter( 'groups_template_group_admin', create_function( '', 'return "groups/single/admin";' ) );
+    add_filter( 'groups_template_group_forum_topic_edit', create_function( '', 'return "groups/single/forum/edit";' ) );
+    add_filter( 'groups_template_group_forum_topic', create_function( '', 'return "groups/single/forum/topic";' ) );
+    add_filter( 'groups_template_group_forum', create_function( '', 'return "groups/single/forum/index";' ) );
+    add_filter( 'groups_template_group_leave', create_function( '', 'return "groups/single/leave-confirm";' ) );
+    add_filter( 'groups_template_group_request_membership', create_function( '', 'return "groups/single/request-membership";' ) );
+    add_filter( 'groups_template_group_invite', create_function( '', 'return "groups/single/send-invite";' ) );
+    add_filter( 'groups_screen_group_members', create_function( '', 'return "groups/single/members";' ) );
+    add_filter( 'groups_template_group_admin_settings', create_function( '', 'return "groups/single/admin";' ) );
+    add_filter( 'groups_template_group_admin_avatar', create_function( '', 'return "groups/single/admin";' ) );
+    add_filter( 'groups_template_group_admin_manage_members', create_function( '', 'return "groups/single/admin";' ) );
+    add_filter( 'groups_template_group_admin_requests', create_function( '', 'return "groups/single/admin";' ) );
+    add_filter( 'groups_template_group_admin_delete_group', create_function( '', 'return "groups/single/admin";' ) );
+}
+add_action( 'init', 'groups_filter_template_paths' );
 function groups_remove_data_for_user( $user_id ) {

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

-                      r2120
+                      r2168
+    }
     /* Static Functions */
 …
+    }
     function get_newest( $limit = null, $page = null ) {
+    function get_newest( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
         global $wpdb, $bp;
 …
             $hidden_sql = "WHERE status != 'hidden'";
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} {$hidden_sql} ORDER BY date_created DESC {$pag_sql}" ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} {$hidden_sql} ORDER BY date_created DESC", $limit ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_active( $limit = null, $page = null ) {
+        if ( $search_terms ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( $user_id ) {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.date_created DESC {$pag_sql}", $user_id ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
+        } else {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY g.date_created DESC {$pag_sql}" ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm INNER JOIN {$bp->groups->table_name} g ON gm.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql}" ) );
+        }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_active( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
         global $wpdb, $bp;
 …
             $hidden_sql = "AND g.status != 'hidden'";
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}" ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(group_id) FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'last_activity' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC" ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_popular( $limit = null, $page = null ) {
+        if ( $search_terms ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( $user_id ) {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY last_activity DESC {$pag_sql}", $user_id ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
+        } else {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY last_activity DESC {$pag_sql}" ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm INNER JOIN {$bp->groups->table_name} g ON gm.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql}" ) );
+        }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_popular( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
         global $wpdb, $bp;
 …
             $hidden_sql = "AND g.status != 'hidden'";
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT gm.group_id FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC {$pag_sql}" ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(gm.group_id) FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name} g WHERE g.id = gm.group_id {$hidden_sql} AND gm.meta_key = 'total_member_count' ORDER BY CONVERT(gm.meta_value, SIGNED) DESC" ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_alphabetically( $limit = null, $page = null ) {
+        if ( $search_terms ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( $user_id ) {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY CONVERT(gm1.meta_value, SIGNED) DESC {$pag_sql}", $user_id ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
+        } else {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY CONVERT(gm1.meta_value, SIGNED) DESC {$pag_sql}" ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql}" ) );
+        }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_alphabetically( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
         global $wpdb, $bp;
 …
         if ( !is_site_admin() )
+            $hidden_sql = "WHERE status != 'hidden'";
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} {$hidden_sql} ORDER BY name ASC {$pag_sql}" ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} {$hidden_sql} ORDER BY name ASC", $limit ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_by_most_forum_topics( $limit = null, $page = null ) {
+            $hidden_sql = " AND status != 'hidden'";
+        if ( $search_terms ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $search_sql = " AND ( name LIKE '%%{$search_terms}%%' OR description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( $user_id ) {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.name ASC {$pag_sql}", $user_id ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity' {$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
+        } else {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql} ORDER BY g.name ASC {$pag_sql}" ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' {$hidden_sql} {$search_sql}" ) );
+        }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_by_most_forum_topics( $limit = null, $page = null, $user_id = false, $search_terms = false ) {
         global $wpdb, $bp, $bbdb;
+        if ( !$bbdb )
+            do_action( 'bbpress_init' );
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        }
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT gm.group_id FROM {$bbdb->forums} AS f, {$bp->groups->table_name} AS g LEFT JOIN {$bp->groups->table_name_groupmeta} AS gm ON g.id = gm.group_id WHERE (gm.meta_key = 'forum_id' AND gm.meta_value = f.forum_id) AND g.status = 'public' ORDER BY f.topics DESC {$pag_sql}" ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT gm.group_id) FROM {$bbdb->forums} AS f, {$bp->groups->table_name} AS g LEFT JOIN {$bp->groups->table_name_groupmeta} AS gm ON g.id = gm.group_id WHERE (gm.meta_key = 'forum_id' AND gm.meta_value = f.forum_id) AND g.status = 'public' ORDER BY f.topics DESC" ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_by_most_forum_posts( $limit = null, $page = null ) {
+        if ( $search_terms ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( $user_id ) {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_groupmeta} gm3, {$bp->groups->table_name_members} m, {$bbdb->forums} f, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND (gm3.meta_key = 'forum_id' AND gm3.meta_value = f.forum_id) {$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY f.topics ASC {$pag_sql}", $user_id ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name_members} m, {$bbdb->forums} f, {$bp->groups->table_name} g WHERE g.id = m.group_id AND (gm.meta_key = 'forum_id' AND gm.meta_value = f.forum_id) {$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
+        } else {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bbdb->forums} f, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'  AND (gm3.meta_key = 'forum_id' AND gm3.meta_value = f.forum_id) {$hidden_sql} {$search_sql} ORDER BY f.topics ASC {$pag_sql}"  ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bbdb->forums} f, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND (gm3.meta_key = 'forum_id' AND gm3.meta_value = f.forum_id) {$hidden_sql} {$search_sql}" ) );
+        }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_by_most_forum_posts( $limit = null, $page = null, $search_terms = false ) {
         global $wpdb, $bp, $bbdb;
+        if ( !$bbdb )
+            do_action( 'bbpress_init' );
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        }
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT gm.group_id FROM {$bbdb->forums} AS f, {$bp->groups->table_name} AS g LEFT JOIN {$bp->groups->table_name_groupmeta} AS gm ON g.id = gm.group_id WHERE (gm.meta_key = 'forum_id' AND gm.meta_value = f.forum_id) AND g.status = 'public' ORDER BY f.posts DESC {$pag_sql}" ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT gm.group_id) FROM {$bbdb->forums} AS f, {$bp->groups->table_name} AS g LEFT JOIN {$bp->groups->table_name_groupmeta} AS gm ON g.id = gm.group_id WHERE (gm.meta_key = 'forum_id' AND gm.meta_value = f.forum_id) AND g.status = 'public' ORDER BY f.posts DESC" ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+        if ( $search_terms ) {
+            $search_terms = like_escape( $wpdb->escape( $search_terms ) );
+            $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+        }
+        if ( $user_id ) {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_groupmeta} gm3, {$bp->groups->table_name_members} m, {$bbdb->forums} f, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND (gm3.meta_key = 'forum_id' AND gm3.meta_value = f.forum_id) {$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY f.posts ASC {$pag_sql}", $user_id ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm, {$bp->groups->table_name_members} m, {$bbdb->forums} f, {$bp->groups->table_name} g WHERE g.id = m.group_id AND (gm.meta_key = 'forum_id' AND gm.meta_value = f.forum_id) {$hidden_sql} {$search_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0", $user_id ) );
+        } else {
+            $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bbdb->forums} f, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'  AND (gm3.meta_key = 'forum_id' AND gm3.meta_value = f.forum_id) {$hidden_sql} {$search_sql} ORDER BY f.posts ASC {$pag_sql}"  ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bbdb->forums} f, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND (gm3.meta_key = 'forum_id' AND gm3.meta_value = f.forum_id) {$hidden_sql} {$search_sql}" ) );
+        }
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_all( $limit = null, $page = null, $only_public = true, $sort_by = false, $order = false ) {
 …
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
             $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} WHERE name LIKE '$letter%%' {$hidden_sql} ORDER BY name ASC" ) );
+        }
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE name LIKE '$letter%%' {$hidden_sql} ORDER BY name ASC {$pag_sql}" ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql}" ) );
+        }
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} ORDER BY g.name ASC {$pag_sql}"  ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
 …
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
             $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT id as group_id, slug FROM {$bp->groups->table_name} WHERE status = 'public' {$hidden_sql} ORDER BY rand()" ) );
+        }
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id, slug FROM {$bp->groups->table_name} WHERE status = 'public' {$hidden_sql} ORDER BY rand() {$pag_sql}" ) );
+            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.status = 'public' {$hidden_sql} {$search_sql}" ) );
+        }
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.status = 'public' {$hidden_sql} {$search_sql} ORDER BY rand() {$pag_sql}" ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
 …
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE group_id = %d AND invite_sent = 1", $group_id ) );
+    }
+    function get_total_group_count() {
+        global $wpdb, $bp;
+        return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name}" ) );
+    }
 …
         if ( $filter ) {
             $filter = like_escape( $wpdb->escape( $filter ) );
             $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+            $filter_sql = " AND ( g.name LIKE '%%{$filter}%%' OR g.description LIKE '%%{$filter}%%' )";
+        }
 …
+    }
     function get_most_popular( $user_id, $limit = false, $page = false, $filter = false ) {
+    function get_is_admin_of( $user_id, $limit = false, $page = false, $filter = false ) {
         global $wpdb, $bp;
 …
         if ( $filter ) {
             like_escape( $wpdb->escape( $filter ) );
             $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+            $filter = like_escape( $wpdb->escape( $filter ) );
+            $filter_sql = " AND ( g.name LIKE '%%{$filter}%%' OR g.description LIKE '%%{$filter}%%' )";
+        }
 …
             $hidden_sql = " AND g.status != 'hidden'";
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY CONVERT( total_member_count, SIGNED ) DESC {$pag_sql}", $user_id ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_confirmed = 1 LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id AND gm.meta_key = 'total_member_count' ORDER BY CONVERT( gm.meta_value, SIGNED ) DESC", $user_id ) );
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
     function get_recently_active( $user_id, $limit = false, $page = false, $filter = false ) {
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_admin = 1 ORDER BY m.date_modified ASC {$pag_sql}", $user_id ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_admin = 1 ORDER BY date_modified ASC", $user_id ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_is_mod_of( $user_id, $limit = false, $page = false, $filter = false ) {
         global $wpdb, $bp;
 …
         if ( $filter ) {
             $filter = like_escape( $wpdb->escape( $filter ) );
+            $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+        }
+        if ( !bp_is_home() )
+            $hidden_sql = " AND g.status != 'hidden'";
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY last_activity DESC {$pag_sql}", $user_id ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m LEFT JOIN {$bp->groups->table_name_groupmeta} gm ON m.group_id = gm.group_id INNER JOIN {$bp->groups->table_name} g ON m.group_id = g.id WHERE gm.meta_key = 'last_activity'{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY gm.meta_value DESC", $user_id ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_alphabetically( $user_id, $limit = false, $page = false, $filter = false ) {
+        global $wpdb, $bp;
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $filter ) {
+            $filter = like_escape( $wpdb->escape( $filter ) );
+            $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+        }
+        if ( !bp_is_home() )
+            $hidden_sql = " AND g.status != 'hidden'";
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.name ASC {$pag_sql}", $user_id ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY g.name ASC", $user_id ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_is_admin_of( $user_id, $limit = false, $page = false, $filter = false ) {
+        global $wpdb, $bp;
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $filter ) {
+            $filter = like_escape( $wpdb->escape( $filter ) );
+            $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+        }
+        if ( !bp_is_home() )
+            $hidden_sql = " AND g.status != 'hidden'";
+        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_admin = 1 ORDER BY m.date_modified ASC {$pag_sql}", $user_id ) );
+        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id{$hidden_sql}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_admin = 1 ORDER BY date_modified ASC", $user_id ) );
+        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+    }
+    function get_is_mod_of( $user_id, $limit = false, $page = false, $filter = false ) {
+        global $wpdb, $bp;
+        if ( $limit && $page )
+            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        if ( $filter ) {
+            $filter = like_escape( $wpdb->escape( $filter ) );
+            $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";
+            $filter_sql = " AND ( g.name LIKE '%%{$filter}%%' OR g.description LIKE '%%{$filter}%%' )";
+        }
 …
     var $display_hook = 'groups_custom_group_boxes';
     var $template_file = 'plugin-template';
+    var $template_file = 'groups/single/plugins';
     // Methods you should override
 …
                 add_action( 'groups_custom_edit_steps', array( &$this, 'edit_screen' ) );
                 if ( '' != locate_template( array( 'groups/single/admin.php' ), false ) ) {
                     bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/single/admin' ) );
+                if ( '' != locate_template( array( 'groups/single/home.php' ), false ) ) {
+                    bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
                 } else {
                     add_action( 'bp_template_content_header', create_function( '', 'echo "<ul class=\"content-header-nav\">"; bp_group_admin_tabs(); echo "</ul>";' ) );
                     add_action( 'bp_template_content', array( &$this, 'edit_screen' ) );
                     bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'plugin-template' ) );
+                    bp_core_load_template( apply_filters( 'bp_core_template_plugin', '/groups/single/plugins' ) );
+                }
+            }
 …
     function _display_hook() {
         add_action( 'bp_template_content', array( &$this, 'display' ) );
         bp_core_load_template( $this->template_file );
+        bp_core_load_template( apply_filters( 'bp_core_template_plugin', $this->template_file ) );
+    }
+}

trunk/bp-groups/bp-groups-filters.php

r2077	r2168
63	63
64	64	/* Only filter the forum SQL on group pages or on the forums directory */
65		if ( ( $bp->groups->current_group && 'public' == $bp->groups->current_group->status ) \|\| ~~bp_is_directory()~~ ) {
	65	if ( ( $bp->groups->current_group && 'public' == $bp->groups->current_group->status ) \|\| $bp->is_directory ) {
66	66	add_filter( 'get_topics_fields', 'groups_add_forum_fields_sql' );
67	67	add_filter( 'get_topics_index_hint', 'groups_add_forum_tables_sql' );

trunk/bp-groups/bp-groups-templatetags.php

-                      r2158
+                      r2168
 <?php
-function bp_groups_header_tabs() {
-    global $bp, $create_group_step, $completed_to_step;
-?>
-    <li<?php if ( !isset($bp->action_variables[0]) || 'recently-active' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'recently-joined' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-joined"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'most-popular' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/most-popular""><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'admin-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/admin-of""><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'mod-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/mod-of""><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'alphabetically' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
-<?php
-    do_action( 'groups_header_tabs' );
+}
-function bp_groups_filter_title() {
-    global $bp;
-    $current_filter = $bp->action_variables[0];
-    switch ( $current_filter ) {
-        case 'recently-active': default:
-            _e( 'Recently Active', 'buddypress' );
-            break;
-        case 'recently-joined':
-            _e( 'Recently Joined', 'buddypress' );
-            break;
-        case 'most-popular':
-            _e( 'Most Popular', 'buddypress' );
-            break;
-        case 'admin-of':
-            _e( 'Administrator Of', 'buddypress' );
-            break;
-        case 'mod-of':
-            _e( 'Moderator Of', 'buddypress' );
-            break;
-        case 'alphabetically':
-            _e( 'Alphabetically', 'buddypress' );
-        break;
+    }
-    do_action( 'bp_groups_filter_title' );
+}
-function bp_is_group_admin_screen( $slug ) {
-    global $bp;
-    if ( $bp->current_component != BP_GROUPS_SLUG || 'admin' != $bp->current_action )
-        return false;
-    if ( $bp->action_variables[0] == $slug )
-        return true;
-    return false;
+}
-function bp_group_current_avatar() {
-    global $bp;
-    if ( $bp->groups->current_group->avatar_full ) { ?>
-        <img src="<?php echo attribute_escape( $bp->groups->current_group->avatar_full ) ?>" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" class="avatar" />
-    <?php } else { ?>
-        <img src="<?php echo $bp->groups->image_base . '/none.gif' ?>" alt="<?php _e( 'No Group Avatar', 'buddypress' ) ?>" class="avatar" />
-    <?php }
+}
-function bp_get_group_has_avatar() {
-    global $bp;
-    if ( !empty( $_FILES ) || !bp_core_fetch_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group', 'no_grav' => true ) ) )
-        return false;
-    return true;
+}
-function bp_group_avatar_delete_link() {
-    echo bp_get_group_avatar_delete_link();
+}
-    function bp_get_group_avatar_delete_link() {
-        global $bp;
-        return apply_filters( 'bp_get_group_avatar_delete_link', wp_nonce_url( bp_get_group_permalink( $bp->groups->current_group ) . '/admin/group-avatar/delete', 'bp_group_avatar_delete' ) );
+    }
-function bp_group_avatar_edit_form() {
-    groups_avatar_upload();
+}
-function bp_custom_group_boxes() {
-    do_action( 'groups_custom_group_boxes' );
+}
-function bp_custom_group_admin_tabs() {
-    do_action( 'groups_custom_group_admin_tabs' );
+}
-function bp_custom_group_fields_editable() {
-    do_action( 'groups_custom_group_fields_editable' );
+}
-function bp_custom_group_fields() {
-    do_action( 'groups_custom_group_fields' );
+}
 /*****************************************************************************
  * User Groups Template Class/Tags
+ * Groups Template Class/Tags
  **/
 class BP_Groups_User_Groups_Template {
+class BP_Groups_Template {
     var $current_group = -1;
     var $group_count;
 …
     var $order;
     function bp_groups_user_groups_template( $user_id, $type, $per_page, $max, $slug, $filter ) {
+    function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms ) {
         global $bp;
+        if ( !$user_id )
+            $user_id = $bp->displayed_user->id;
+        $this->pag_page = isset( $_REQUEST['grpage'] ) ? intval( $_REQUEST['grpage'] ) : 1;
+        $this->pag_page = isset( $_REQUEST['grpage'] ) ? intval( $_REQUEST['grpage'] ) : $page;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
         switch ( $type ) {
             case 'recently-joined':
                 $this->groups = groups_get_recently_joined_for_user( $user_id, $this->pag_num, $this->pag_page, $filter );
+            case 'active': default:
+                $this->groups = groups_get_active( $this->pag_num, $this->pag_page, $user_id, $search_terms );
                 break;
+            case 'alphabetical': default:
+                $this->groups = groups_get_alphabetically( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                break;
+            case 'random':
+                $this->groups = groups_get_random_groups( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                break;
+            case 'newest':
+                $this->groups = groups_get_newest( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                break;
             case 'popular':
                 $this->groups = groups_get_most_popular_for_user( $user_id, $this->pag_num, $this->pag_page, $filter );
+                $this->groups = groups_get_popular( $this->pag_num, $this->pag_page, $user_id, $search_terms );
                 break;
+            case 'most-forum-topics':
+                $this->groups = groups_get_by_most_forum_topics( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                break;
+            case 'most-forum-posts':
+                $this->groups = groups_get_by_most_forum_posts( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                break;
             case 'admin-of':
+                $this->groups = groups_get_user_is_admin_of( $user_id, $this->pag_num, $this->pag_page, $filter );
+                if ( $user_id )
+                    $this->groups = groups_get_user_is_admin_of( $user_id, $this->pag_num, $this->pag_page, $search_terms );
                 break;
             case 'mod-of':
+                $this->groups = groups_get_user_is_mod_of( $user_id, $this->pag_num, $this->pag_page, $filter );
+                if ( $user_id )
+                    $this->groups = groups_get_user_is_mod_of( $user_id, $this->pag_num, $this->pag_page, $filter );
                 break;
-            case 'alphabetical':
-                $this->groups = groups_get_alphabetically_for_user( $user_id, $this->pag_num, $this->pag_page, $filter );
-                break;
             case 'invites':
+                $this->groups = groups_get_invites_for_user();
+                if ( $user_id )
+                    $this->groups = groups_get_invites_for_user();
                 break;
 …
                 $group->group_id = BP_Groups_Group::get_id_from_slug($slug);
                 $this->groups = array( $group );
-                break;
-            case 'active': default:
-                $this->groups = groups_get_recently_active_for_user( $user_id, $this->pag_num, $this->pag_page, $filter );
                 break;
+        }
 …
             'total' => ceil($this->total_group_count / $this->pag_num),
             'current' => $this->pag_page,
             'prev_text' => '&laquo;',
             'next_text' => '&raquo;',
+            'prev_text' => '&larr;',
+            'next_text' => '&rarr;',
             'mid_size' => 1
         ));
 …
+    }
     function user_groups() {
+    function groups() {
         if ( $this->current_group + 1 < $this->group_count ) {
             return true;
 …
         if ( $this->single_group )
             $this->group = new BP_Groups_Group( $this->group->group_id, true, true );
+        else {
+            if ( $this->group )
+                wp_cache_set( 'groups_group_nouserdata_' . $group->group_id, $this->group, 'bp' );
+        }
         if ( 0 == $this->current_group ) // loop has just started
 …
     $defaults = array(
         'type' => 'active',
         'user_id' => false,
         'per_page' => 10,
+        'page' => 1,
+        'per_page' => 20,
         'max' => false,
+        'slug' => false,
+        'filter' => false
+        'user_id' => false, // Pass a user ID to limit to groups this user has joined
+        'slug' => false, // Pass a group slug to only return that group
+        'search_terms' => false // Pass search terms to return only matching groups
     );
 …
+    }
     if ( isset( $_REQUEST['group-filter-box'] ) )
         $filter = $_REQUEST['group-filter-box'];
     $groups_template = new BP_Groups_User_Groups_Template( $user_id, $type, $per_page, $max, $slug, $filter );
+    if ( isset( $_REQUEST['group-filter-box'] ) || isset( $_REQUEST['s'] ) )
+        $search_terms = ( isset( $_REQUEST['group-filter-box'] ) ) ? $_REQUEST['group-filter-box'] : $_REQUEST['s'];
+    $groups_template = new BP_Groups_Template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms );
     return apply_filters( 'bp_has_groups', $groups_template->has_groups(), &$groups_template );
+}
 …
 function bp_groups() {
     global $groups_template;
     return $groups_template->user_groups();
+    return $groups_template->groups();
+}
 …
             $group =& $groups_template->group;
         return apply_filters( 'bp_get_group_date_created', date( get_option( 'date_format' ), $group->date_created ) );
+        return apply_filters( 'bp_get_group_date_created', bp_core_time_since( strtotime( $group->date_created ) ) );
+    }
 …
     $label = __('Filter Groups', 'buddypress');
     $name = 'group-filter-box';
 ?>
     <form action="<?php echo $action ?>" id="group-search-form" method="post">
 …
+}
 function bp_group_pagination() {
     echo bp_get_group_pagination();
+}
     function bp_get_group_pagination() {
+function bp_groups_pagination_links() {
+    echo bp_get_groups_pagination_links();
+}
+    function bp_get_groups_pagination_links() {
         global $groups_template;
         return apply_filters( 'bp_get_group_pagination', $groups_template->pag_links );
+    }
 function bp_group_pagination_count() {
+        return apply_filters( 'bp_get_groups_pagination_links', $groups_template->pag_links );
+    }
+function bp_groups_pagination_count() {
     global $bp, $groups_template;
 …
         return apply_filters( 'bp_get_group_total_members', $group->total_member_count );
+    }
+function bp_group_member_count() {
+    echo bp_get_group_member_count();
+}
+    function bp_get_group_member_count() {
+        global $groups_template;
+        if ( 1 == (int) $groups_template->group->total_member_count )
+            return apply_filters( 'bp_get_group_member_count', sprintf( __( '%d member', 'buddypress' ), (int) $groups_template->group->total_member_count ) );
+        else
+            return apply_filters( 'bp_get_group_member_count', sprintf( __( '%d members', 'buddypress' ), (int) $groups_template->group->total_member_count ) );
+    }
 …
+}
+function bp_group_hidden_fields() {
+    if ( isset( $_REQUEST['s'] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ) . '" name="search_terms" />';
+    }
+    if ( isset( $_REQUEST['letter'] ) ) {
+        echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+    }
+    if ( isset( $_REQUEST['groups_search'] ) ) {
+        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['groups_search'] ) . '" name="search_terms" />';
+    }
+}
 /***************************************************************************
 …
             'total' => ceil( $this->total_member_count / $this->pag_num ),
             'current' => $this->pag_page,
             'prev_text' => '&laquo;',
             'next_text' => '&raquo;',
+            'prev_text' => '&larr;',
+            'next_text' => '&rarr;',
             'mid_size' => 1
         ));
 …
         $is_enabled = bp_are_previous_group_creation_steps_complete( $slug ); ?>
         <li<?php if ( $bp->groups->current_create_step == $slug ) : ?> class="current"<?php endif; ?>><?php if ( $is_enabled ) : ?><a href="<?php echo $bp->loggedin_user->domain . $bp->groups->slug ?>/create/step/<?php echo $slug ?>"><?php endif; ?><?php echo $counter ?>. <?php echo $step['name'] ?><?php if ( $is_enabled ) : ?></a><?php endif; ?></li><?php
+        <li<?php if ( $bp->groups->current_create_step == $slug ) : ?> class="current"<?php endif; ?>><?php if ( $is_enabled ) : ?><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/create/step/<?php echo $slug ?>/"><?php else: ?><span><?php endif; ?><?php echo $counter ?>. <?php echo $step['name'] ?><?php if ( $is_enabled ) : ?></a><?php else: ?></span><?php endif ?></li><?php
         $counter++;
+    }
 …
             $bp->action_variables[1] = array_shift( array_keys( $bp->groups->group_creation_steps ) );
         return apply_filters( 'bp_get_group_creation_form_action', $bp->loggedin_user->domain . $bp->groups->slug . '/create/step/' . $bp->action_variables[1] );
+        return apply_filters( 'bp_get_group_creation_form_action', $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->action_variables[1] );
+    }
 …
+    }
-/********************************************************************************
- * Site Groups Template Tags
- **/
-class BP_Groups_Site_Groups_Template {
-    var $current_group = -1;
-    var $group_count;
-    var $groups;
-    var $group;
-    var $in_the_loop;
-    var $pag_page;
-    var $pag_num;
-    var $pag_links;
-    var $total_group_count;
-    function bp_groups_site_groups_template( $type, $per_page, $max ) {
-        global $bp;
-        /* TODO: Move $_REQUEST vars out of here */
-        $this->pag_page = isset( $_REQUEST['gpage'] ) ? intval( $_REQUEST['gpage'] ) : 1;
-        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
-        if ( isset( $_REQUEST['s'] ) && '' != $_REQUEST['s'] && $type != 'random' ) {
-            $this->groups = BP_Groups_Group::search_groups( $_REQUEST['s'], $this->pag_num, $this->pag_page );
-        } else if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
-            $this->groups = BP_Groups_Group::get_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page );
-        } else {
-            switch ( $type ) {
-                case 'active': default:
-                    $this->groups = groups_get_active( $this->pag_num, $this->pag_page );
-                    break;
-                case 'alphabetical': default:
-                    $this->groups = groups_get_alphabetically( $this->pag_num, $this->pag_page );
-                    break;
-                case 'random':
-                    $this->groups = groups_get_random_groups( $this->pag_num, $this->pag_page );
-                    break;
-                case 'newest':
-                    $this->groups = groups_get_newest( $this->pag_num, $this->pag_page );
-                    break;
-                case 'popular':
-                    $this->groups = groups_get_popular( $this->pag_num, $this->pag_page );
-                    break;
-                case 'most-forum-topics':
-                    $this->groups = groups_get_by_most_forum_topics( $this->pag_num, $this->pag_page );
-                    break;
-                case 'most-forum-posts':
-                    $this->groups = groups_get_by_most_forum_posts( $this->pag_num, $this->pag_page );
-                    break;
+            }
+        }
-        if ( !$max || $max >= (int)$this->groups['total'] )
-            $this->total_group_count = (int)$this->groups['total'];
-        else
-            $this->total_group_count = (int)$max;
-        $this->groups = $this->groups['groups'];
-        if ( $max ) {
-            if ( $max >= count($this->groups) )
-                $this->group_count = count($this->groups);
-            else
-                $this->group_count = (int)$max;
-        } else {
-            $this->group_count = count($this->groups);
+        }
-        if ( (int) $this->total_group_count && (int) $this->pag_num ) {
-            $this->pag_links = paginate_links( array(
-                'base' => add_query_arg( 'gpage', '%#%' ),
-                'format' => '',
-                'total' => ceil( (int) $this->total_group_count / (int) $this->pag_num ),
-                'current' => (int) $this->pag_page,
-                'prev_text' => '&laquo;',
-                'next_text' => '&raquo;',
-                'mid_size' => 1
-            ));
+    }
+    }
-    function has_groups() {
-        if ( $this->group_count )
-            return true;
-        return false;
+    }
-    function next_group() {
-        $this->current_group++;
-        $this->group = $this->groups[$this->current_group];
-        return $this->group;
+    }
-    function rewind_groups() {
-        $this->current_group = -1;
-        if ( $this->group_count > 0 ) {
-            $this->group = $this->groups[0];
+        }
+    }
-    function groups() {
-        if ( $this->current_group + 1 < $this->group_count ) {
-            return true;
-        } elseif ( $this->current_group + 1 == $this->group_count ) {
-            do_action('loop_end');
-            // Do some cleaning up after the loop
-            $this->rewind_groups();
+        }
-        $this->in_the_loop = false;
-        return false;
+    }
-    function the_group() {
-        global $group;
-        $this->in_the_loop = true;
-        $this->group = $this->next_group();
-        if ( !$group = wp_cache_get( 'groups_group_nouserdata_' . $this->group->group_id, 'bp' ) ) {
-            $group = new BP_Groups_Group( $this->group->group_id, false, false );
-            wp_cache_set( 'groups_group_nouserdata_' . $this->group->group_id, $group, 'bp' );
+        }
-        $this->group = $group;
-        if ( 0 == $this->current_group ) // loop has just started
-            do_action('loop_start');
+    }
+}
-function bp_rewind_site_groups() {
-    global $site_groups_template;
-    $site_groups_template->rewind_groups();
+}
-function bp_has_site_groups( $args = '' ) {
-    global $site_groups_template;
-    $defaults = array(
-        'type' => 'active',
-        'per_page' => 10,
-        'max' => false
-    );
-    $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );
-    // type: active ( default ) | random | newest | popular
-    if ( $max ) {
-        if ( $per_page > $max )
-            $per_page = $max;
+    }
-    $site_groups_template = new BP_Groups_Site_Groups_Template( $type, $per_page, $max );
-    return apply_filters( 'bp_has_site_groups', $site_groups_template->has_groups(), &$site_groups_template );
+}
-function bp_site_groups() {
-    global $site_groups_template;
-    return $site_groups_template->groups();
+}
-function bp_the_site_group() {
-    global $site_groups_template;
-    return $site_groups_template->the_group();
+}
-function bp_site_groups_pagination_count() {
-    global $bp, $site_groups_template;
-    $from_num = intval( ( $site_groups_template->pag_page - 1 ) * $site_groups_template->pag_num ) + 1;
-    $to_num = ( $from_num + ( $site_groups_template->pag_num - 1 ) > $site_groups_template->total_group_count ) ? $site_groups_template->total_group_count : $from_num + ( $site_groups_template->pag_num - 1) ;
-    echo sprintf( __( 'Viewing group %d to %d (of %d groups)', 'buddypress' ), $from_num, $to_num, $site_groups_template->total_group_count ); ?> &nbsp;
-    <span class="ajax-loader"></span><?php
+}
-function bp_site_groups_pagination_links() {
-    echo bp_get_site_groups_pagination_links();
+}
-    function bp_get_site_groups_pagination_links() {
-        global $site_groups_template;
-        return apply_filters( 'bp_get_site_groups_pagination_links', $site_groups_template->pag_links );
+    }
-function bp_the_site_group_id() {
-    echo bp_get_the_site_group_id();
+}
-    function bp_get_the_site_group_id() {
-        global $site_groups_template;
-        return apply_filters( 'bp_get_the_site_group_id', $site_groups_template->group->id );
+    }
-function bp_the_site_group_avatar( $args = '' ) {
-    echo bp_get_the_site_group_avatar( $args );
+}
-    function bp_get_the_site_group_avatar( $args = '' ) {
-        global $site_groups_template;
-        $defaults = array(
-            'type' => 'full',
-            'width' => false,
-            'height' => false,
-            'class' => 'avatar',
-            'id' => false,
-            'alt' => __( 'Group avatar', 'buddypress' )
-        );
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-        return apply_filters( 'bp_the_site_group_avatar', bp_core_fetch_avatar( array( 'item_id' => $site_groups_template->group->id, 'object' => 'group', 'type' => $type, 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height ) ) );
+    }
-function bp_the_site_group_avatar_thumb() {
-    echo bp_get_the_site_group_avatar_thumb();
+}
-    function bp_get_the_site_group_avatar_thumb() {
-        global $site_groups_template;
-        return apply_filters( 'bp_get_the_site_group_avatar_thumb', bp_core_fetch_avatar( array( 'item_id' => $site_groups_template->group->id, 'object' => 'group', 'type' => 'thumb', 'avatar_dir' => 'group-avatars', 'alt' => __( 'Group Avatar', 'buddypress' ) ) ) );
+    }
-function bp_the_site_group_avatar_mini() {
-    echo bp_get_the_site_group_avatar_mini();
+}
-    function bp_get_the_site_group_avatar_mini() {
-        global $site_groups_template;
-        return apply_filters( 'bp_get_the_site_group_avatar_mini', bp_core_fetch_avatar( array( 'item_id' => $site_groups_template->group->id, 'object' => 'group', 'type' => 'thumb', 'width' => 30, 'height' => 30, 'avatar_dir' => 'group-avatars', 'alt' => __( 'Group Avatar', 'buddypress' ) ) ) );
+    }
-function bp_the_site_group_link() {
-    echo bp_get_the_site_group_link();
+}
-    function bp_get_the_site_group_link() {
-        global $site_groups_template;
-        return apply_filters( 'bp_get_the_site_group_link', bp_get_group_permalink( $site_groups_template->group ) );
+    }
-function bp_the_site_group_name() {
-    echo bp_get_the_site_group_name();
+}
-    function bp_get_the_site_group_name() {
-        global $site_groups_template;
-        return apply_filters( 'bp_get_the_site_group_name', bp_get_group_name( $site_groups_template->group ) );
+    }
-function bp_the_site_group_last_active() {
-    echo bp_get_the_site_group_last_active();
+}
-    function bp_get_the_site_group_last_active() {
-        global $site_groups_template;
-        return apply_filters( 'bp_get_the_site_group_last_active', sprintf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active( $site_groups_template->group ) ) );
+    }
-function bp_the_site_group_join_button() {
-    global $site_groups_template;
-    echo bp_group_join_button( $site_groups_template->group );
+}
-function bp_the_site_group_description() {
-    echo bp_get_the_site_group_description();
+}
-    function bp_get_the_site_group_description() {
-        global $site_groups_template;
-        return apply_filters( 'bp_get_the_site_group_description', bp_get_group_description( $site_groups_template->group ) );
+    }
-function bp_the_site_group_description_excerpt() {
-    echo bp_get_the_site_group_description_excerpt();
+}
-    function bp_get_the_site_group_description_excerpt() {
-        global $site_groups_template;
-        return apply_filters( 'bp_get_the_site_group_description_excerpt', bp_create_excerpt( bp_get_group_description( $site_groups_template->group, false ), 25 ) );
+    }
-function bp_the_site_group_date_created() {
-    echo bp_get_the_site_group_date_created();
+}
-    function bp_get_the_site_group_date_created() {
-        global $site_groups_template;
-        return apply_filters( 'bp_get_the_site_group_date_created', bp_core_time_since( $site_groups_template->group->date_created ) );
+    }
-function bp_the_site_group_member_count() {
-    echo bp_get_the_site_group_member_count();
+}
-    function bp_get_the_site_group_member_count() {
-        global $site_groups_template;
-        if ( 1 == (int) $site_groups_template->group->total_member_count )
-            return apply_filters( 'bp_get_the_site_group_member_count', sprintf( __( '%d member', 'buddypress' ), (int) $site_groups_template->group->total_member_count ) );
-        else
-            return apply_filters( 'bp_get_the_site_group_member_count', sprintf( __( '%d members', 'buddypress' ), (int) $site_groups_template->group->total_member_count ) );
+    }
-function bp_the_site_group_type() {
-    echo bp_get_the_site_group_type();
+}
-    function bp_get_the_site_group_type() {
-        global $site_groups_template;
-        return apply_filters( 'bp_get_the_site_group_type', bp_get_group_type( $site_groups_template->group ) );
+    }
-function bp_the_site_group_forum_topic_count( $args = '' ) {
-    echo bp_get_the_site_group_forum_topic_count( $args );
+}
-    function bp_get_the_site_group_forum_topic_count( $args = '' ) {
-        global $site_groups_template;
-        $defaults = array(
-            'showtext' => false
-        );
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-        if ( !$forum_id = groups_get_groupmeta( $site_groups_template->group->id, 'forum_id' ) )
-            return false;
-        if ( !function_exists( 'bp_forums_get_forum_topicpost_count' ) )
-            return false;
-        if ( !$site_groups_template->group->forum_counts )
-            $site_groups_template->group->forum_counts = bp_forums_get_forum_topicpost_count( (int)$forum_id );
-        if ( (bool) $showtext ) {
-            if ( 1 == (int) $site_groups_template->group->forum_counts[0]->topics )
-                $total_topics = sprintf( __( '%d topic', 'buddypress' ), (int) $site_groups_template->group->forum_counts[0]->topics );
-            else
-                $total_topics = sprintf( __( '%d topics', 'buddypress' ), (int) $site_groups_template->group->forum_counts[0]->topics );
-        } else {
-            $total_topics = (int) $site_groups_template->group->forum_counts[0]->topics;
+        }
-        return apply_filters( 'bp_get_the_site_group_forum_topic_count', $total_topics, (bool)$showtext );
+    }
-function bp_the_site_group_forum_post_count( $args = '' ) {
-    echo bp_get_the_site_group_forum_post_count( $args );
+}
-    function bp_get_the_site_group_forum_post_count( $args = '' ) {
-        global $site_groups_template;
-        $defaults = array(
-            'showtext' => false
-        );
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-        if ( !$forum_id = groups_get_groupmeta( $site_groups_template->group->id, 'forum_id' ) )
-            return false;
-        if ( !function_exists( 'bp_forums_get_forum_topicpost_count' ) )
-            return false;
-        if ( !$site_groups_template->group->forum_counts )
-            $site_groups_template->group->forum_counts = bp_forums_get_forum_topicpost_count( (int)$forum_id );
-        if ( (bool) $showtext ) {
-            if ( 1 == (int) $site_groups_template->group->forum_counts[0]->posts )
-                $total_posts = sprintf( __( '%d post', 'buddypress' ), (int) $site_groups_template->group->forum_counts[0]->posts );
-            else
-                $total_posts = sprintf( __( '%d posts', 'buddypress' ), (int) $site_groups_template->group->forum_counts[0]->posts );
-        } else {
-            $total_posts = (int) $site_groups_template->group->forum_counts[0]->posts;
+        }
-        return apply_filters( 'bp_get_the_site_group_forum_post_count', $total_posts, (bool)$showtext );
+    }
-function bp_the_site_group_hidden_fields() {
-    if ( isset( $_REQUEST['s'] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['s'] ) . '" name="search_terms" />';
+    }
-    if ( isset( $_REQUEST['letter'] ) ) {
-        echo '<input type="hidden" id="selected_letter" value="' . attribute_escape( $_REQUEST['letter'] ) . '" name="selected_letter" />';
+    }
-    if ( isset( $_REQUEST['groups_search'] ) ) {
-        echo '<input type="hidden" id="search_terms" value="' . attribute_escape( $_REQUEST['groups_search'] ) . '" name="search_terms" />';
+    }
+}
 function bp_directory_groups_search_form() {
+    global $bp; ?>
+    global $bp;
+    $search_value = __( 'Search anything...', 'buddypress' );
+    if ( !empty( $_REQUEST['s'] ) )
+        $search_value = $_REQUEST['s'];
+    else if ( !empty( $_COOKIE['bp-groups-search-terms'] ) && 'false' != $_COOKIE['bp-groups-search-terms'] )
+        $search_value = $_COOKIE['bp-groups-search-terms'];
+?>
     <form action="" method="get" id="search-groups-form">
         <label><input type="text" name="s" id="groups_search" value="<?php if ( isset( $_GET['s'] ) ) { echo attribute_escape( $_GET['s'] ); } else { _e( 'Search anything...', 'buddypress' ); } ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+        <label><input type="text" name="s" id="groups_search" value="<?php echo attribute_escape($search_value) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
         <input type="submit" id="groups_search_submit" name="groups_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
     </form>
 <?php
+}
+function bp_groups_header_tabs() {
+    global $bp, $create_group_step, $completed_to_step;
+?>
+    <li<?php if ( !isset($bp->action_variables[0]) || 'recently-active' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'recently-joined' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-joined"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'most-popular' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/most-popular""><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'admin-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/admin-of""><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'mod-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/mod-of""><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'alphabetically' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
+<?php
+    do_action( 'groups_header_tabs' );
+}
+function bp_groups_filter_title() {
+    global $bp;
+    $current_filter = $bp->action_variables[0];
+    switch ( $current_filter ) {
+        case 'recently-active': default:
+            _e( 'Recently Active', 'buddypress' );
+            break;
+        case 'recently-joined':
+            _e( 'Recently Joined', 'buddypress' );
+            break;
+        case 'most-popular':
+            _e( 'Most Popular', 'buddypress' );
+            break;
+        case 'admin-of':
+            _e( 'Administrator Of', 'buddypress' );
+            break;
+        case 'mod-of':
+            _e( 'Moderator Of', 'buddypress' );
+            break;
+        case 'alphabetically':
+            _e( 'Alphabetically', 'buddypress' );
+        break;
+    }
+    do_action( 'bp_groups_filter_title' );
+}
+function bp_is_group_admin_screen( $slug ) {
+    global $bp;
+    if ( $bp->current_component != BP_GROUPS_SLUG || 'admin' != $bp->current_action )
+        return false;
+    if ( $bp->action_variables[0] == $slug )
+        return true;
+    return false;
+}
+/************************************************************************************
+ * Group Avatar Template Tags
+ **/
+function bp_group_current_avatar() {
+    global $bp;
+    if ( $bp->groups->current_group->avatar_full ) { ?>
+        <img src="<?php echo attribute_escape( $bp->groups->current_group->avatar_full ) ?>" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" class="avatar" />
+    <?php } else { ?>
+        <img src="<?php echo $bp->groups->image_base . '/none.gif' ?>" alt="<?php _e( 'No Group Avatar', 'buddypress' ) ?>" class="avatar" />
+    <?php }
+}
+function bp_get_group_has_avatar() {
+    global $bp;
+    if ( !empty( $_FILES ) || !bp_core_fetch_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group', 'no_grav' => true ) ) )
+        return false;
+    return true;
+}
+function bp_group_avatar_delete_link() {
+    echo bp_get_group_avatar_delete_link();
+}
+    function bp_get_group_avatar_delete_link() {
+        global $bp;
+        return apply_filters( 'bp_get_group_avatar_delete_link', wp_nonce_url( bp_get_group_permalink( $bp->groups->current_group ) . '/admin/group-avatar/delete', 'bp_group_avatar_delete' ) );
+    }
+function bp_group_avatar_edit_form() {
+    groups_avatar_upload();
+}
+function bp_custom_group_boxes() {
+    do_action( 'groups_custom_group_boxes' );
+}
+function bp_custom_group_admin_tabs() {
+    do_action( 'groups_custom_group_admin_tabs' );
+}
+function bp_custom_group_fields_editable() {
+    do_action( 'groups_custom_group_fields_editable' );
+}
+function bp_custom_group_fields() {
+    do_action( 'groups_custom_group_fields' );
+}
 /************************************************************************************
 …
             'total' => ceil( $this->total_request_count / $this->pag_num ),
             'current' => $this->pag_page,
             'prev_text' => '&laquo;',
             'next_text' => '&raquo;',
+            'prev_text' => '&larr;',
+            'next_text' => '&rarr;',
             'mid_size' => 1
         ));

trunk/bp-groups/bp-groups-widgets.php

-                      r2077
+                      r2168
            . $after_title; ?>
         <?php if ( bp_has_site_groups( 'type=popular&per_page=' . $instance['max_groups'] . '&max=' . $instance['max_groups'] ) ) : ?>
+        <?php if ( bp_has_groups( 'type=popular&per_page=' . $instance['max_groups'] . '&max=' . $instance['max_groups'] ) ) : ?>
             <div class="item-options" id="groups-list-options">
                 <span class="ajax-loader" id="ajax-loader-groups"></span>
 …
             <ul id="groups-list" class="item-list">
                 <?php while ( bp_site_groups() ) : bp_the_site_group(); ?>
+                <?php while ( bp_groups() ) : bp_the_group(); ?>
                     <li>
                         <div class="item-avatar">
                             <a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_avatar_thumb() ?></a>
+                            <a href="<?php bp_group_permalink() ?>"><?php bp_group_avatar_thumb() ?></a>
                         </div>
                         <div class="item">
                             <div class="item-title"><a href="<?php bp_the_site_group_link() ?>" title="<?php bp_the_site_group_name() ?>"><?php bp_the_site_group_name() ?></a></div>
                             <div class="item-meta"><span class="activity"><?php bp_the_site_group_member_count() ?></span></div>
+                            <div class="item-title"><a href="<?php bp_group_permalink() ?>" title="<?php bp_group_name() ?>"><?php bp_group_name() ?></a></div>
+                            <div class="item-meta"><span class="activity"><?php bp_group_member_count() ?></span></div>
                         </div>
                     </li>
 …
+    }
     if ( bp_has_site_groups( 'type=' . $type . '&per_page=' . $_POST['max_groups'] . '&max=' . $_POST['max_groups'] ) ) : ?>
+    if ( bp_has_groups( 'type=' . $type . '&per_page=' . $_POST['max_groups'] . '&max=' . $_POST['max_groups'] ) ) : ?>
         <?php echo "0[[SPLIT]]"; ?>
         <ul id="groups-list" class="item-list">
             <?php while ( bp_site_groups() ) : bp_the_site_group(); ?>
+            <?php while ( bp_groups() ) : bp_the_group(); ?>
                 <li>
                     <div class="item-avatar">
                         <a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_avatar_thumb() ?></a>
+                        <a href="<?php bp_group_permalink() ?>"><?php bp_group_avatar_thumb() ?></a>
                     </div>
                     <div class="item">
                         <div class="item-title"><a href="<?php bp_the_site_group_link() ?>" title="<?php bp_the_site_group_name() ?>"><?php bp_the_site_group_name() ?></a></div>
+                        <div class="item-title"><a href="<?php bp_group_permalink() ?>" title="<?php bp_group_name() ?>"><?php bp_group_name() ?></a></div>
                         <div class="item-meta">
                             <span class="activity">
                                 <?php
                                 if ( 'newest-groups' == $_POST['filter'] ) {
                                     bp_the_site_group_date_created();
+                                    printf( __( 'created %s ago', 'buddypress' ), bp_get_group_date_created() );
                                 } else if ( 'recently-active-groups' == $_POST['filter'] ) {
                                     bp_the_site_group_last_active();
+                                    printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() );
                                 } else if ( 'popular-groups' == $_POST['filter'] ) {
                                     bp_the_site_group_member_count();
+                                    bp_group_member_count();
+                                }
                                 ?>

trunk/bp-loader.php

-                      r2077
+                      r2168
     include( BP_PLUGIN_DIR . '/bp-messages.php' );
-/* Wire Support */
-if ( !isset( $deactivated['bp-wire.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-wire.php') )
-    include( BP_PLUGIN_DIR . '/bp-wire.php' );
 /* Extended Profiles */
 if ( !isset( $deactivated['bp-xprofile.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-xprofile.php') )
     include( BP_PLUGIN_DIR . '/bp-xprofile.php' );
-/* Status Updates */
-if ( !isset( $deactivated['bp-status.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-status.php') )
-    include( BP_PLUGIN_DIR . '/bp-status.php' );
 ?>

trunk/bp-messages.php

-                      r2114
+                      r2168
 require ( BP_PLUGIN_DIR . '/bp-messages/bp-messages-templatetags.php' );
 require ( BP_PLUGIN_DIR . '/bp-messages/bp-messages-filters.php' );
-/* Include deprecated functions if settings allow */
-if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-    require ( BP_PLUGIN_DIR . '/bp-messages/deprecated/bp-messages-deprecated.php' );
 function messages_install() {
 …
 function messages_screen_inbox() {
     do_action( 'messages_screen_inbox' );
     bp_core_load_template( apply_filters( 'messages_template_inbox', 'messages/index' ) );
+    bp_core_load_template( apply_filters( 'messages_template_inbox', 'members/single/messages' ) );
+}
 function messages_screen_sentbox() {
     do_action( 'messages_screen_sentbox' );
     bp_core_load_template( apply_filters( 'messages_template_sentbox', 'messages/sentbox' ) );
+    bp_core_load_template( apply_filters( 'messages_template_sentbox', 'members/single/messages' ) );
+}
 …
     do_action( 'messages_screen_compose' );
     bp_core_load_template( apply_filters( 'messages_template_compose', 'messages/compose' ) );
+    bp_core_load_template( apply_filters( 'messages_template_compose', 'members/single/messages' ) );
+}
 …
     do_action( 'messages_screen_notices' );
     bp_core_load_template( apply_filters( 'messages_template_notices', 'messages/notices' ) );
+    bp_core_load_template( apply_filters( 'messages_template_notices', 'members/single/messages' ) );
+}
 …
     bp_core_new_subnav_item( array( 'name' => sprintf( __( 'From: %s', 'buddypress'), BP_Messages_Thread::get_last_sender($thread_id) ), 'slug' => 'view', 'parent_url' => $bp->loggedin_user->domain . $bp->messages->slug . '/', 'parent_slug' => $bp->messages->slug, 'screen_function' => true, 'position' => 40, 'user_has_access' => bp_is_home() ) );
     bp_core_load_template( apply_filters( 'messages_template_view_message', 'messages/view' ) );
+    bp_core_load_template( apply_filters( 'messages_template_view_message', 'members/single/messages' ) );
+}
 add_action( 'wp', 'messages_action_view_message', 3 );
 …
+}
+/**
+ * messages_filter_template_paths()
+ *
+ * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
+ * older than 1.2.
+ *
+ * @package BuddyPress Core
+ */
+function messages_filter_template_paths() {
+    if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+        return false;
+    add_filter( 'messages_template_compose', create_function( '', 'return "messages/compose";' ) );
+    add_filter( 'messages_template_sentbox', create_function( '', 'return "messages/sentbox";' ) );
+    add_filter( 'messages_template_inbox', create_function( '', 'return "messages/index";' ) );
+    add_filter( 'messages_template_notices', create_function( '', 'return "messages/notices";' ) );
+    add_filter( 'messages_template_view_message', create_function( '', 'return "messages/view";' ) );
+}
+add_action( 'init', 'messages_filter_template_paths' );
 // List actions to clear super cached pages on, if super cache is installed
 add_action( 'messages_delete_thread', 'bp_core_clear_cache' );

trunk/bp-messages/bp-messages-filters.php

r1951	r2168
44	44	add_filter( 'bp_get_message_notice_text', 'wpautop' );
45	45	add_filter( 'bp_get_message_thread_subject', 'wpautop' );
46		~~add_filter( 'bp_get_message_thread_excerpt', 'wpautop' );~~
47	46	add_filter( 'bp_get_the_thread_message_content', 'wpautop' );
48	47

trunk/bp-messages/bp-messages-templatetags.php

r2077	r2168
176	176	function bp_get_message_thread_excerpt() {
177	177	global $messages_template;
178		return apply_filters( 'bp_get_message_thread_excerpt', ~~bp_create_excerpt($messages_template->thread->last_message_message, 20~~) );
	178	return apply_filters( 'bp_get_message_thread_excerpt', strip_tags( bp_create_excerpt($messages_template->thread->last_message_message, 10 ) ) );
179	179	}
180	180

trunk/bp-themes/bp-default/style.css

-                      r2077
+                      r2168
 /*
 Theme Name: BuddyPress Default
+Theme Name: BuddyPress Classic
 Theme URI: http://buddypress.org/extend/themes/
 Description: The default theme for BuddyPress.
+Description: The classic theme for BuddyPress from version 1.1 and earlier.
 Version: 1.2-bleeding
 Author: BuddyPress.org

trunk/bp-themes/bp-sn-parent/activity/just-me.php

r2158	r2168
54	54	<div class="activity">
55	55
56		<?php if ( bp_has_activities( '~~type=personal&max=20&per_page=2~~0&display_comments=stream&show_hidden=' . bp_is_home() ) ) : ?>
	56	<?php if ( bp_has_activities( 'user_id=' . bp_displayed_user_id() . '&per_page=25&max=500&display_comments=stream&show_hidden=' . bp_is_home() ) ) : ?>
57	57
58	58	<ul id="activity-list" class="activity-list item-list">

trunk/bp-themes/bp-sn-parent/activity/my-friends.php

r2126	r2168
22	22	<h4><?php _e( 'My Friends Activity', 'buddypress' ) ?> <a href="<?php bp_activities_member_rss_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ) ?>"><?php _e( 'RSS Feed', 'buddypress' ) ?></a></h4>
23	23
24		<?php if ( bp_has_activities( '~~type=friends&per_page=25&max=500~~' ) ) : ?>
	24	<?php if ( bp_has_activities( 'user_id=' . bp_get_friend_ids() . '&per_page=25&max=500&display_comments=stream' ) ) : ?>
25	25
26	26	<div class="pagination">

trunk/bp-themes/bp-sn-parent/blogs/my-blogs.php

-                      r2077
+                      r2168
         <?php do_action( 'bp_before_my_blogs_content' ) ?>
         <?php if ( bp_has_blogs() ) : ?>
+        <?php if ( bp_has_blogs( 'user_id=' . bp_displayed_user_id() ) ) : ?>
             <ul id="blog-list" class="item-list">
                 <?php while ( bp_blogs() ) : bp_the_blog(); ?>
+            <?php while ( bp_blogs() ) : bp_the_blog(); ?>
                     <li>
                         <h4><a href="<?php bp_blog_permalink() ?>"><?php bp_blog_title() ?></a></h4>
+                        <h4><a href="<?php bp_blog_permalink() ?>"><?php bp_blog_name() ?></a></h4>
                         <p><?php bp_blog_description() ?></p>

trunk/bp-themes/bp-sn-parent/directories/blogs/blogs-loop.php

-                      r2114
+                      r2168
 <?php if ( bp_has_site_blogs( 'type=active&per_page=10' ) ) : ?>
+<?php if ( bp_has_blogs( 'type=active&per_page=10' ) ) : ?>
     <div class="pagination">
         <div class="pag-count" id="blog-dir-count">
             <?php bp_site_blogs_pagination_count() ?>
+            <?php bp_blogs_pagination_count() ?>
         </div>
         <div class="pagination-links" id="blog-dir-pag">
             <?php bp_site_blogs_pagination_links() ?>
+            <?php bp_blogs_pagination_links() ?>
         </div>
 …
     <ul id="blogs-list" class="item-list">
     <?php while ( bp_site_blogs() ) : bp_the_site_blog(); ?>
+    <?php while ( bp_blogs() ) : bp_the_blog(); ?>
         <li>
             <div class="item-avatar">
                 <a href="<?php bp_the_site_blog_link() ?>"><?php bp_the_site_blog_avatar_thumb() ?></a>
+                <a href="<?php bp_blog_permalink() ?>"><?php bp_blog_avatar_thumb() ?></a>
             </div>
             <div class="item">
                 <div class="item-title"><a href="<?php bp_the_site_blog_link() ?>"><?php bp_the_site_blog_name() ?></a></div>
                 <div class="item-meta"><span class="activity"><?php bp_the_site_blog_last_active() ?></span></div>
+                <div class="item-title"><a href="<?php bp_blog_permalink() ?>"><?php bp_blog_name() ?></a></div>
+                <div class="item-meta"><span class="activity"><?php bp_blog_last_active() ?></span></div>
                 <?php do_action( 'bp_core_directory_blogs_item' ) ?>
 …
             <div class="action">
                 <div class="generic-button blog-button visit">
                     <a href="<?php bp_the_site_blog_link() ?>" class="visit" title="<?php _e( 'Visit Blog', 'buddypress' ) ?>"><?php _e( 'Visit Blog', 'buddypress' ) ?></a>
+                    <a href="<?php bp_blog_permalink() ?>" class="visit" title="<?php _e( 'Visit Blog', 'buddypress' ) ?>"><?php _e( 'Visit Blog', 'buddypress' ) ?></a>
                 </div>
                 <div class="meta">
                     <?php bp_the_site_blog_latest_post() ?>
+                    <?php bp_blog_latest_post() ?>
                 </div>
 …
     <?php do_action( 'bp_after_directory_blogs_list' ) ?>
     <?php bp_the_site_blog_hidden_fields() ?>
+    <?php bp_blog_hidden_fields() ?>
 <?php else: ?>

trunk/bp-themes/bp-sn-parent/directories/blogs/index.php

-                      r2077
+                      r2168
             <h3><?php _e( 'Random Blogs', 'buddypress' ) ?></h3>
             <?php if ( bp_has_site_blogs( 'type=random&max=3' ) ) : ?>
+            <?php if ( bp_has_blogs( 'type=random&max=3' ) ) : ?>
                 <ul id="featured-blogs-list" class="item-list">
                     <?php while ( bp_site_blogs() ) : bp_the_site_blog(); ?>
+                    <?php while ( bp_blogs() ) : bp_the_blog(); ?>
                         <li>
                             <div class="item-avatar">
                                 <a href="<?php bp_the_site_blog_link() ?>"><?php bp_the_site_blog_avatar_thumb() ?></a>
+                                <a href="<?php bp_blog_permalink() ?>"><?php bp_blog_avatar_thumb() ?></a>
                             </div>
                             <div class="item">
                                 <div class="item-title"><a href="<?php bp_the_site_blog_link() ?>"><?php bp_the_site_blog_name() ?></a></div>
                                 <div class="item-meta"><span class="activity"><?php bp_the_site_blog_last_active() ?></span></div>
+                                <div class="item-title"><a href="<?php bp_blog_permalink() ?>"><?php bp_blog_name() ?></a></div>
+                                <div class="item-meta"><span class="activity"><?php bp_blog_last_active() ?></span></div>
+                                <div class="field-data">
+                                    <div class="field-name">
+                                        <strong><?php _e( 'Description: ', 'buddypress' ) ?></strong>
+                                        <?php bp_the_site_blog_description() ?>
+                                    </div>
+                                </div>
+                                <?php do_action( 'bp_core_directory_blogs_item' ) ?>
+                            </div>
+                                <?php do_action( 'bp_directory_blogs_featured_item' ) ?>
+                            </div>
+                            <div class="clear"></div>
                         </li>

trunk/bp-themes/bp-sn-parent/directories/forums/index.php

-                      r2077
+                      r2168
             <form action="<?php echo site_url() . '/' ?>" method="post" id="forums-directory-form">
                 <?php if ( bp_has_site_groups( 'type=most-forum-topics&max=6' ) ) : ?>
+                <?php if ( bp_has_groups( 'type=most-forum-topics&max=6' ) ) : ?>
                     <div id="popular-group-forum-listing">
 …
                         <?php do_action( 'bp_before_directory_popular_group_forums' ) ?>
                         <?php while ( bp_site_groups() ) : bp_the_site_group(); ?>
+                        <?php while ( bp_groups() ) : bp_the_group(); ?>
                             <div class="group-forum">
                                 <div class="item-avatar">
                                     <a href="<?php bp_the_site_group_link() ?>/forum/"><?php bp_the_site_group_avatar_thumb() ?></a>
+                                    <a href="<?php bp_group_permalink() ?>/forum/"><?php bp_group_avatar_thumb() ?></a>
                                 </div>
                                 <div class="item">
                                     <div class="item-title"><a href="<?php bp_the_site_group_link() ?>/forum/"><?php bp_the_site_group_name() ?></a> (<?php bp_the_site_group_forum_topic_count( 'showtext=true' ) ?>, <?php bp_the_site_group_forum_post_count( 'showtext=true' ) ?>)</div>
                                     <div class="item-meta desc"><?php bp_the_site_group_description_excerpt() ?></div>
+                                    <div class="item-title"><a href="<?php bp_group_link() ?>/forum/"><?php bp_group_name() ?></a> (<?php bp_group_forum_topic_count( 'showtext=true' ) ?>, <?php bp_group_forum_post_count( 'showtext=true' ) ?>)</div>
+                                    <div class="item-meta desc"><?php bp_group_description_excerpt() ?></div>
                                     <?php do_action( 'bp_directory_popular_group_forums_item' ) ?>

trunk/bp-themes/bp-sn-parent/directories/groups/groups-loop.php

-                      r2114
+                      r2168
 <?php if ( bp_has_site_groups( 'type=active&per_page=10' ) ) : ?>
+<?php if ( bp_has_groups( 'type=active&per_page=10' ) ) : ?>
     <div class="pagination">
         <div class="pag-count" id="group-dir-count">
             <?php bp_site_groups_pagination_count() ?>
+            <?php bp_groups_pagination_count() ?>
         </div>
         <div class="pagination-links" id="group-dir-pag">
             <?php bp_site_groups_pagination_links() ?>
+            <?php bp_groups_pagination_links() ?>
         </div>
 …
     <ul id="groups-list" class="item-list">
     <?php while ( bp_site_groups() ) : bp_the_site_group(); ?>
+    <?php while ( bp_groups() ) : bp_the_group(); ?>
         <li>
             <div class="item-avatar">
                 <a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_avatar_thumb() ?></a>
+                <a href="<?php bp_group_permalink() ?>"><?php bp_group_avatar_thumb() ?></a>
             </div>
             <div class="item">
                 <div class="item-title"><a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_name() ?></a></div>
                 <div class="item-meta"><span class="activity"><?php bp_the_site_group_last_active() ?></span></div>
+                <div class="item-title"><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a></div>
+                <div class="item-meta"><span class="activity"><?php bp_group_last_active() ?></span></div>
                 <div class="item-meta desc"><?php bp_the_site_group_description_excerpt() ?></div>
+                <div class="item-meta desc"><?php bp_group_description_excerpt() ?></div>
                 <?php do_action( 'bp_directory_groups_item' ) ?>
 …
             <div class="action">
                 <?php bp_the_site_group_join_button() ?>
+                <?php bp_group_join_button() ?>
                 <div class="meta">
                     <?php bp_the_site_group_type() ?> / <?php bp_the_site_group_member_count() ?>
+                    <?php bp_group_type() ?> / <?php bp_group_member_count() ?>
                 </div>
 …
     <?php do_action( 'bp_after_directory_groups_list' ) ?>
     <?php bp_the_site_group_hidden_fields() ?>
+    <?php bp_group_hidden_fields() ?>
 <?php else: ?>

trunk/bp-themes/bp-sn-parent/directories/groups/index.php

-                      r2077
+                      r2168
             <h3><?php _e( 'Random Groups', 'buddypress' ) ?></h3>
             <?php if ( bp_has_site_groups( 'type=random&max=3' ) ) : ?>
+            <?php if ( bp_has_groups( 'type=random&max=3' ) ) : ?>
                 <ul id="groups-list" class="item-list">
                     <?php while ( bp_site_groups() ) : bp_the_site_group(); ?>
+                    <?php while ( bp_groups() ) : bp_the_group(); ?>
                         <li>
                             <div class="item-avatar">
                                 <a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_avatar_thumb() ?></a>
+                                <a href="<?php bp_group_permalink() ?>"><?php bp_group_avatar_thumb() ?></a>
                             </div>
                             <div class="item">
+                                <div class="item-title"><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a></div>
+                                <div class="item-meta"><span class="activity"><?php bp_group_last_active() ?></span></div>
+                                <div class="item-title"><a href="<?php bp_the_site_group_link() ?>"><?php bp_the_site_group_name() ?></a></div>
+                                <div class="item-meta"><span class="activity"><?php bp_the_site_group_last_active() ?></span></div>
+                                <div class="item-meta desc"><?php bp_group_description_excerpt() ?></div>
+                                <div class="field-data">
+                                    <div class="field-name">
+                                        <strong><?php _e( 'Members:', 'buddypress' ) ?></strong>
+                                        <?php bp_the_site_group_member_count() ?>
+                                    </div>
+                                    <div class="field-name">
+                                        <strong><?php _e( 'Description:', 'buddypress' ) ?></strong>
+                                        <?php bp_the_site_group_description_excerpt() ?>
+                                    </div>
+                                </div>
+                                <?php do_action( 'bp_directory_groups_featured_item' ) ?>
+                                <?php do_action( 'bp_directory_groups_item' ) ?>
                             </div>
+                            <div class="clear"></div>
                         </li>

trunk/bp-themes/bp-sn-parent/directories/members/index.php

-                      r2077
+                      r2168
             <h3><?php _e( 'Random Members', 'buddypress' ) ?></h3>
             <?php if ( bp_has_site_members( 'type=random&max=3' ) ) : ?>
+            <?php if ( bp_has_members( 'type=random&max=3' ) ) : ?>
                 <ul id="featured-members-list" class="item-list">
                 <?php while ( bp_site_members() ) : bp_the_site_member(); ?>
+                <?php while ( bp_members() ) : bp_the_member(); ?>
                     <li>
                         <div class="item-avatar">
                             <a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_avatar() ?></a>
+                            <a href="<?php bp_member_link() ?>"><?php bp_member_avatar() ?></a>
                         </div>
                         <div class="item">
                             <div class="item-title"><a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_name() ?></a></div>
                             <div class="item-meta"><span class="activity"><?php bp_the_site_member_last_active() ?></span></div>
+                            <div class="item-title"><a href="<?php bp_member_link() ?>"><?php bp_member_name() ?></a></div>
+                            <div class="item-meta"><span class="activity"><?php bp_member_last_active() ?></span></div>
                             <div class="field-data">
+                                <div class="field-name"><?php bp_the_site_member_total_friend_count() ?></div>
+                                <div class="field-name xprofile-data"><?php bp_the_site_member_random_profile_data() ?></div>
+                                <div class="field-name xprofile-data"><?php bp_member_random_profile_data() ?></div>
                             </div>

trunk/bp-themes/bp-sn-parent/directories/members/members-loop.php

-                      r2114
+                      r2168
 <?php if ( bp_has_site_members( 'type=active&per_page=10' ) ) : ?>
+<?php if ( bp_has_members( 'type=active&per_page=10' ) ) : ?>
     <div class="pagination">
         <div class="pag-count" id="member-dir-count">
             <?php bp_site_members_pagination_count() ?>
+            <?php bp_members_pagination_count() ?>
         </div>
         <div class="pagination-links" id="member-dir-pag">
             <?php bp_site_members_pagination_links() ?>
+            <?php bp_members_pagination_links() ?>
         </div>
 …
     <ul id="members-list" class="item-list">
     <?php while ( bp_site_members() ) : bp_the_site_member(); ?>
+    <?php while ( bp_members() ) : bp_the_member(); ?>
         <li>
             <div class="item-avatar">
                 <a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_avatar() ?></a>
+                <a href="<?php bp_member_link() ?>"><?php bp_member_avatar() ?></a>
             </div>
             <div class="item">
                 <div class="item-title"><a href="<?php bp_the_site_member_link() ?>"><?php bp_the_site_member_name() ?></a></div>
                 <div class="item-meta"><span class="activity"><?php bp_the_site_member_last_active() ?></span></div>
+                <div class="item-title"><a href="<?php bp_member_link() ?>"><?php bp_member_name() ?></a></div>
+                <div class="item-meta"><span class="activity"><?php bp_member_last_active() ?></span></div>
                 <?php do_action( 'bp_directory_members_item' ) ?>
 …
             <div class="action">
                 <?php bp_the_site_member_add_friend_button() ?>
+                <?php bp_member_add_friend_button() ?>
                 <?php do_action( 'bp_directory_members_actions' ) ?>
 …
     <?php do_action( 'bp_after_directory_members_list' ) ?>
     <?php bp_the_site_member_hidden_fields() ?>
+    <?php bp_member_hidden_fields() ?>
 <?php else: ?>

trunk/bp-themes/bp-sn-parent/friends/friends-loop.php

-                      r2077
+                      r2168
 <div id="friends-loop">
     <?php if ( bp_has_friendships() ) : ?>
+    <?php if ( bp_has_members( 'user_id=' . bp_displayed_user_id() ) ) : ?>
         <div class="pagination">
             <div class="pag-count">
                 <?php bp_friend_pagination_count() ?>
+            <div class="pag-count" id="member-dir-count">
+                <?php bp_members_pagination_count() ?>
             </div>
             <div class="pagination-links" id="pag">
                 <?php bp_friend_pagination() ?>
+            <div class="pagination-links" id="member-dir-pag">
+                <?php bp_members_pagination_links() ?>
             </div>
 …
         <ul id="friend-list" class="item-list">
+            <?php while ( bp_user_friendships() ) : bp_the_friendship(); ?>
+            <?php while ( bp_members() ) : bp_the_member(); ?>
                 <li>
                     <?php bp_friend_avatar_thumb() ?>
                     <h4><?php bp_friend_link() ?></h4>
                     <span class="activity"><?php bp_friend_last_active() ?></span>
+                    <div class="item-avatar">
+                        <a href="<?php bp_member_link() ?>"><?php bp_member_avatar() ?></a>
+                    </div>
+                    <?php do_action( 'bp_my_friends_list_item' ) ?>
+                    <div class="item">
+                        <div class="item-title"><a href="<?php bp_member_link() ?>"><?php bp_member_name() ?></a></div>
+                        <div class="item-meta"><span class="activity"><?php bp_member_last_active() ?></span></div>
+                        <div class="field-data">
+                            <div class="field-name"><?php bp_member_total_friend_count() ?></div>
+                            <div class="field-name xprofile-data"><?php bp_member_random_profile_data() ?></div>
+                        </div>
+                        <?php do_action( 'bp_directory_members_featured_item' ) ?>
+                    </div>
                     <div class="action">
 …
             <?php endwhile; ?>
+            <?php do_action( 'bp_after_my_friends_list' ) ?>
         </ul>
-        <?php do_action( 'bp_after_my_friends_list' ) ?>
     <?php else: ?>
+        <?php if ( bp_friends_is_filtered() ) : ?>
+        <div id="message" class="info">
+            <p><?php _e( "No friends were found.", 'buddypress' ) ?></p>
+        </div>
+            <div id="message" class="info">
+                <p><?php _e( "No friends matched your search filter terms", 'buddypress' ) ?></p>
+            </div>
+        <?php else : ?>
+            <div id="message" class="info">
+                <p><?php bp_word_or_name( __( "Your friends list is currently empty", 'buddypress' ), __( "%s's friends list is currently empty", 'buddypress' ) ) ?></p>
+            </div>
+        <?php endif; ?>
+        <?php if ( bp_is_home() && !bp_friends_is_filtered() ) : ?>
+            <?php do_action( 'bp_before_random_members_list' ) ?>
+            <h3><?php _e( 'Why not make friends with some of these members?', 'buddypress' ) ?></h3>
+            <?php bp_friends_random_members() ?>
+            <?php do_action( 'bp_after_random_members_list' ) ?>
+        <?php endif; ?>
+    <?php endif;?>
+    <?php endif; ?>
 </div>

trunk/bp-themes/bp-sn-parent/friends/requests.php

-                      r2077
+                      r2168
     <div id="content">
-        <div class="pagination">
-            <div class="pagination-links" id="pag">
-                <?php bp_friend_pagination() ?>
-            </div>
-        </div>
         <h2><?php _e( 'Friendship Requests', 'buddypress' ); ?></h2>
         <?php do_action( 'template_notices' ) // (error/success feedback) ?>
 …
         <?php do_action( 'bp_before_friend_requests_content' ) ?>
         <?php if ( bp_has_friendships() ) : ?>
+        <?php if ( bp_has_members( 'include=' . bp_get_friendship_requests() ) ) : ?>
             <ul id="friend-list" class="item-list">
                 <?php while ( bp_user_friendships() ) : bp_the_friendship(); ?>
+                <?php while ( bp_members() ) : bp_the_member(); ?>
                     <li>
                         <?php bp_friend_avatar_thumb() ?>
                         <h4><?php bp_friend_link() ?></h4>
                         <span class="activity"><?php bp_friend_time_since_requested() ?></span>
+                <li>
+                    <div class="item-avatar">
+                        <a href="<?php bp_member_link() ?>"><?php bp_member_avatar() ?></a>
+                    </div>
+                        <?php do_action( 'bp_friend_requests_item' ) ?>
+                    <div class="item">
+                        <div class="item-title"><a href="<?php bp_member_link() ?>"><?php bp_member_name() ?></a></div>
+                        <div class="item-meta"><span class="activity"><?php bp_member_last_active() ?></span></div>
+                    </div>
                         <div class="action">
                             <div class="generic-button accept">
                                 <a href="<?php bp_friend_accept_request_link() ?>"><?php _e( 'Accept', 'buddypress' ); ?></a>
                             </div>
+                    <div class="action">
+                        <div class="generic-button accept">
+                            <a href="<?php bp_friend_accept_request_link() ?>"><?php _e( 'Accept', 'buddypress' ); ?></a>
+                        </div>
                              &nbsp;
+                         &nbsp;
                             <div class="generic-button reject">
                                 <a href="<?php bp_friend_reject_request_link() ?>"><?php _e( 'Reject', 'buddypress' ); ?></a>
                             </div>
+                        <div class="generic-button reject">
+                            <a href="<?php bp_friend_reject_request_link() ?>"><?php _e( 'Reject', 'buddypress' ); ?></a>
+                        </div>
+                            <?php do_action( 'bp_friend_requests_item_action' ) ?>
+                        </div>
+                    </li>
+                        <?php do_action( 'bp_friend_requests_item_action' ) ?>
+                    </div>
+                    <div class="clear"></div>
+                </li>
                 <?php endwhile; ?>

trunk/bp-themes/bp-sn-parent/groups/group-loop.php

-                      r2077
+                      r2168
         <div class="pagination">
             <div class="pag-count">
                 <?php bp_group_pagination_count() ?>
+            <div class="pag-count" id="group-dir-count">
+                <?php bp_groups_pagination_count() ?>
             </div>
             <div class="pagination-links" id="<?php bp_group_pag_id() ?>">
                 <?php bp_group_pagination() ?>
+            <div class="pagination-links" id="group-dir-pag">
+                <?php bp_groups_pagination_links() ?>
             </div>
         </div>
         <?php do_action( 'bp_before_my_groups_list' ) ?>
+        <?php do_action( 'bp_before_directory_groups_list' ) ?>
         <ul id="group-list" class="item-list">
+        <ul id="groups-list" class="item-list">
             <?php while ( bp_groups() ) : bp_the_group(); ?>

trunk/bp-themes/bp-sn-parent/groups/single/send-invite.php

-                      r2077
+                      r2168
     <div id="content">
-        <div class="pagination">
-            <div class="pagination-links" id="pag">
-                <?php bp_group_pagination() ?>
-            </div>
-        </div>
         <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>

trunk/bp-xprofile.php

-                      r2088
+                      r2168
 require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-notifications.php' );
 require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-cssjs.php' );
-/* Include deprecated functions if settings allow */
-if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-    require ( BP_PLUGIN_DIR . '/bp-xprofile/deprecated/bp-xprofile-deprecated.php' );
 /* Assign the base group and fullname field names to constants to use in SQL statements */
 …
     do_action( 'xprofile_screen_display_profile', $_GET['new'] );
     bp_core_load_template( apply_filters( 'xprofile_template_display_profile', 'profile/index' ) );
+    bp_core_load_template( apply_filters( 'xprofile_template_display_profile', 'members/single/profile' ) );
+}
 …
     do_action( 'xprofile_screen_edit_profile' );
     bp_core_load_template( apply_filters( 'xprofile_template_edit_profile', 'profile/edit' ) );
+    bp_core_load_template( apply_filters( 'xprofile_template_edit_profile', 'members/single/profile' ) );
+}
 …
     do_action( 'xprofile_screen_change_avatar' );
     bp_core_load_template( apply_filters( 'xprofile_template_change_avatar', 'profile/change-avatar' ) );
+    bp_core_load_template( apply_filters( 'xprofile_template_change_avatar', 'members/single/profile' ) );
+}
 …
 /**
+ * xprofile_filter_template_paths()
+ *
+ * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
+ * older than 1.2.
+ *
+ * @package BuddyPress Core
+ */
+function xprofile_filter_template_paths() {
+    if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+        return false;
+    add_filter( 'xprofile_template_display_profile', create_function( '', 'return "profile/index";' ) );
+    add_filter( 'xprofile_template_edit_profile', create_function( '', 'return "profile/edit";' ) );
+    add_filter( 'xprofile_template_change_avatar', create_function( '', 'return "profile/change-avatar";' ) );
+}
+add_action( 'init', 'xprofile_filter_template_paths' );
+/**
  * xprofile_remove_data_on_user_deletion()
+ *

trunk/bp-xprofile/bp-xprofile-templatetags.php

-                      r2145
+                      r2168
+}
+function bp_profile_field_data( $args = '' ) {
+    echo bp_get_profile_field_data( $args );
+}
+    function bp_get_profile_field_data( $args = '' ) {
+        $defaults = array(
+            'field' => false, // Field name or ID.
+            'user_id' => $bp->displayed_user->id
+            );
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+        return apply_filters( 'bp_get_profile_field_data', xprofile_get_field_data( $field, $user_id ) );
+    }
 function bp_profile_group_tabs() {
     global $bp, $group_name;

Context Navigation

Legend:

Download in other formats: