Changeset 2088

Timestamp:

11/13/2009 01:01:37 AM (15 years ago)

Author:

apeatling

Message:

Initial support for threaded activity stream commenting. Some major performance improvements around fetching profile and group data.

Location:

trunk

Files:

• bp-activity.php (modified) (6 diffs)
• bp-activity/bp-activity-classes.php (modified) (7 diffs)
• bp-activity/bp-activity-filters.php (modified) (1 diff)
• bp-activity/bp-activity-templatetags.php (modified) (9 diffs)
• bp-activity/deprecated/bp-activity-deprecated.php (modified) (1 diff)
• bp-blogs/bp-blogs-templatetags.php (modified) (77 diffs)
• bp-core.php (modified) (9 diffs)
• bp-core/bp-core-avatars.php (modified) (2 diffs)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/bp-core-classes.php (modified) (2 diffs)
• bp-core/bp-core-templatetags.php (modified) (3 diffs)
• bp-core/deprecated/bp-core-deprecated.php (modified) (1 diff)
• bp-groups.php (modified) (1 diff)
• bp-groups/bp-groups-classes.php (modified) (6 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (4 diffs)
• bp-xprofile.php (modified) (3 diffs)
• bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-filters.php (modified) (3 diffs)

trunk/bp-activity.php

@@ -1 +1 @@
 <?php
 
-define ( 'BP_ACTIVITY_DB_VERSION', '1800' );
+define ( 'BP_ACTIVITY_DB_VERSION', '1900' );
 
 /* Define the slug for the component */
@@ -33 +33 @@
                 date_recorded datetime NOT NULL,
                 hide_sitewide bool DEFAULT 0,
+                mptt_left int(11) NOT NULL,
+                mptt_right int(11) NOT NULL,
                 KEY date_recorded (date_recorded),
                 KEY user_id (user_id),
@@ -224 +226 @@
  */
 
+function bp_activity_get_sitewide( $args = '' ) {
+    $defaults = array(
+        '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' => false, // false for no comments. 'stream' for within stream display, 'threaded' for below each activity item
+
+        'search_terms' => false, // Pass search terms as a string
+
+        /**
+         * Pass filters as an array:
+         * array(
+         *  'user_id' => false, // user_id to filter on
+         *  'object' => false, // object to filter on e.g. groups, profile, status, friends
+         *  'action' => false, // action to filter on e.g. new_wire_post, new_forum_post, profile_updated
+         *  'primary_id' => false, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
+         *  'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
+         * );
+         */
+        'filter' => array()
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    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 ), &$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
+        '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 ), &$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 );
+}
+
+function bp_activity_get_specific( $args = '' ) {
+    $defaults = array(
+        'activity_ids' => false, // A single activity_id or array of IDs.
+        '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' => false // true or false to display threaded comments for these specific activity items
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+
+    return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get_specific( $activity_ids, $max, $page, $per_page, $sort, $display_comments ) );
+}
+
 function bp_activity_add( $args = '' ) {
     global $bp, $wpdb;
@@ -247 +319 @@
         $content = bp_activity_add_timesince_placeholder( $content );
 
-    $activity = new BP_Activity_Activity;
+    /* Pass certain values so we can update an activity item if it already exists */
+    $activity = new BP_Activity_Activity();
+
     $activity->user_id = $user_id;
     $activity->content = $content;
@@ -261 +335 @@
         return false;
 
-    do_action( 'bp_activity_add', $args );
-
-    return true;
+    /* If this is an activity comment, rebuild the tree */
+    if ( 'activity_comment' == $activity->component_action )
+        BP_Activity_Activity::rebuild_activity_comment_tree( $activity->item_id );
+
+    do_action( 'bp_activity_add', $r );
+
+    return $activity->id;
 }
 
@@ -374 +452 @@
 }
 
-function bp_activity_get_sitewide_activity( $max_items = 30, $pag_num = false, $pag_page = false, $filter = false ) {
-    return apply_filters( 'bp_activity_get_sitewide_activity', BP_Activity_Activity::get_sitewide_activity( $max_items, $pag_num, $pag_page, $filter ), $max_items, $pag_num, $pag_page, $filter );
-}
-
-function bp_activity_get_user_activity( $user_id, $max_items = 30, $pag_num = false, $pag_page = false, $filter = false ) {
-    return apply_filters( 'bp_activity_get_user_activity', BP_Activity_Activity::get_activity_for_user( $user_id, $max_items, $pag_num, $pag_page, $filter ), $user_id, $max_items, $pag_num, $pag_page, $filter );
-}
-
-function bp_activity_get_friends_activity( $user_id, $max_items = 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 );
-}
-
 function bp_activity_remove_data( $user_id ) {
     // Clear the user's activity from the sitewide stream and clear their activity tables

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

@@ -26 +26 @@
         $activity = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id = %d", $this->id ) );
 
-        $this->id = $activity->id;
-        $this->item_id = $activity->item_id;
-        $this->secondary_item_id = $activity->secondary_item_id;
-        $this->user_id = $activity->user_id;
-        $this->content = $activity->content;
-        $this->primary_link = $activity->primary_link;
-        $this->component_name = $activity->component_name;
-        $this->component_action = $activity->component_action;
-        $this->date_recorded = $activity->date_recorded;
-        $this->hide_sitewide = $activity->hide_sitewide;
+        if ( $activity ) {
+            $this->id = $activity->id;
+            $this->item_id = $activity->item_id;
+            $this->secondary_item_id = $activity->secondary_item_id;
+            $this->user_id = $activity->user_id;
+            $this->content = $activity->content;
+            $this->primary_link = $activity->primary_link;
+            $this->component_name = $activity->component_name;
+            $this->component_action = $activity->component_action;
+            $this->date_recorded = $activity->date_recorded;
+            $this->hide_sitewide = $activity->hide_sitewide;
+        }
     }
 
@@ -63 +65 @@
             $this->primary_link = $bp->loggedin_user->domain;
 
-        if ( $existing_activity_id = $this->exists() )
-            BP_Activity_Activity::delete_by_activity_id( $existing_activity_id );
-
         /* If we have an existing ID, update the activity item, otherwise insert it. */
-        if ( $this->id ) {
-            if ( $wpdb->query( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component_name = %s, component_action = %s, content = %s, primary_link = %s, date_recorded = FROM_UNIXTIME(%d), item_id = %s, secondary_item_id = %s, hide_sitewide = %d WHERE id = %d", $this->user_id, $this->component_name, $this->component_action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->id ) ) ) {
-                do_action( 'bp_activity_after_save', $this );
-                return true;
-            }
-        } else {
-            if ( $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->activity->table_name} ( user_id, component_name, component_action, content, primary_link, date_recorded, item_id, secondary_item_id, hide_sitewide ) VALUES ( %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), %s, %s, %d )", $this->user_id, $this->component_name, $this->component_action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide ) ) ) {
-                do_action( 'bp_activity_after_save', $this );
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    function exists() {
-        global $wpdb, $bp;
-
-        /* This doesn't seem to be working correctly at the moment, so it is disabled [TODO] */
-        return false;
-
-        /* If we have an item id, try and match on that, if not do a content match */
-        if ( $this->item_id ) {
-            if ( $this->secondary_item_id )
-                $secondary_sql = $wpdb->prepare( " AND secondary_item_id = %s", $secondary_item_id );
-
-            return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND item_id = %s{$secondary_sql} AND component_name = %s AND component_action = %s", $this->user_id, $this->item_id, $this->component_name, $this->component_action ) );
-        } else {
-            return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE user_id = %d AND content = %s AND component_name = %s AND component_action = %s", $this->user_id, $this->content, $this->component_name, $this->component_action ) );
-        }
+        if ( $this->id )
+            $q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component_name = %s, component_action = %s, content = %s, primary_link = %s, date_recorded = FROM_UNIXTIME(%d), item_id = %s, secondary_item_id = %s, hide_sitewide = %d WHERE id = %d", $this->user_id, $this->component_name, $this->component_action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->id );
+        else
+            $q = $wpdb->prepare( "INSERT INTO {$bp->activity->table_name} ( user_id, component_name, component_action, content, primary_link, date_recorded, item_id, secondary_item_id, hide_sitewide ) VALUES ( %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), %s, %s, %d )", $this->user_id, $this->component_name, $this->component_action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide );
+
+        if ( !$wpdb->query( $q ) )
+            return false;
+
+        $this->id = $wpdb->insert_id;
+
+        do_action( 'bp_activity_after_save', $this );
+        return true;
     }
 
@@ -144 +125 @@
     }
 
-    function get_activity_for_user( $user_id, $max_items, $limit, $page, $filter ) {
-        global $wpdb, $bp;
+    function get_activity_for_user( $user_id, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = 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 )
+            $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
+
+        /* Sorting */
+        if ( $sort != 'ASC' && $sort != 'DESC' )
+            $sort = 'DESC';
+
+        /* 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} 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} 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} 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} 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} 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} 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 )
@@ -157 +192 @@
             $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
 
-        if ( $limit && $page && $max_items )
-            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d $filter_sql ORDER BY date_recorded DESC $pag_sql", $user_id ) );
-        else
-            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d $filter_sql ORDER BY date_recorded DESC $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 $filter_sql ORDER BY date_recorded DESC $max_sql", $user_id ) );
-
-        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 );
 
@@ -190 +197 @@
             return false;
 
-        $friend_ids = implode( ',', $friend_ids );
+        $friend_ids = $wpdb->escape( implode( ',', $friend_ids ) );
 
         if ( $limit && $page && $max_items )
@@ -202 +209 @@
     }
 
-    function get_sitewide_activity( $max, $limit, $page, $filter ) {
-        global $wpdb, $bp;
-
-        if ( $limit && $page )
-            $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+    function get_sitewide_activity( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false ) {
+        global $wpdb, $bp;
+
+        if ( $per_page && $page )
+            $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
 
         if ( $max )
             $max_sql = $wpdb->prepare( "LIMIT %d", $max );
 
-        /* Sort out filtering */
+        /* Searching */
+        if ( $search_terms ) {
+            $search_terms = $wpdb->escape( $search_terms );
+            $search_sql = "AND content LIKE '%%" . like_escape( $search_terms ) . "%%'";
+        }
+
+        /* Filtering */
         if ( $filter )
             $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
 
-        if ( $limit && $page && $max )
-            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 $filter_sql ORDER BY date_recorded DESC $pag_sql" ) );
+        /* Sorting */
+        if ( $sort != 'ASC' && $sort != 'DESC' )
+            $sort = 'DESC';
+
+        /* 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 hide_sitewide = 0 {$search_sql} {$filter_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$pag_sql}" ) );
+            else
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_sql} AND component_action != 'activity_comment' 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 hide_sitewide = 0 {$search_sql} {$filter_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$max_sql}" ) );
+
+            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 hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY date_recorded {$sort} {$pag_sql}" ) );
+            else
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 {$search_sql} {$filter_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 hide_sitewide = 0 {$search_sql} {$filter_sql} ORDER BY date_recorded {$sort} {$max_sql}" ) );
+
+            if ( $activities )
+                $activities = BP_Activity_Activity::append_comments( &$activities );
+        }
+
+        return array( 'activities' => $activities, 'total' => (int)$total_activities );
+    }
+
+    function get_specific( $activity_ids, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $display_comments = false ) {
+        global $wpdb, $bp;
+
+        if ( is_array( $activity_ids ) )
+            $activity_ids = implode( ',', $activity_ids );
+
+        $activity_ids = $wpdb->escape( $activity_ids );
+
+        if ( $per_page && $page )
+            $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
+
+        if ( $max )
+            $max_sql = $wpdb->prepare( "LIMIT %d", $max );
+
+        if ( $sort != 'ASC' && $sort != 'DESC' )
+            $sort = 'DESC';
+
+        $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) ORDER BY date_recorded {$sort} $pag_sql $max_sql" ) );
+        $total_activities = $wpdb->get_results( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) ORDER BY date_recorded {$sort}" ) );
+
+        if ( $display_comments )
+            $activities = BP_Activity_Activity::append_comments( $activities );
+
+        return array( 'activities' => $activities, 'total' => (int)$total_activities );
+    }
+
+    function append_comments( $activities ) {
+        global $bp, $wpdb;
+
+        /* Now fetch the activity comments and parse them into the correct position in the activities array. */
+        foreach( $activities as $activity ) {
+            if ( 'activity_comment' != $activity->component_action )
+                $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right );
+        }
+
+        /* Merge the comments with the activity items */
+        foreach( $activities as $key => $activity )
+            $activities[$key]->children = $activity_comments[$activity->id];
+
+        return $activities;
+    }
+
+    function get_activity_comments( $activity_id, $left, $right ) {
+        global $wpdb, $bp;
+
+        /* Start with an empty $stack */
+        $stack = array();
+
+        /* Retrieve all descendants of the $root node */
+        $descendants = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE component_action = 'activity_comment' AND item_id = %d AND mptt_left BETWEEN %d AND %d", $activity_id, $left, $right ) );
+
+        /* Loop descendants and build an assoc array */
+        foreach ( $descendants as $d ) {
+            $d->children = array();
+
+            /* We have a reference on its parent */
+            if ( isset( $ref[ $d->secondary_item_id ] ) ) {
+                $ref[ $d->secondary_item_id ]->children[ $d->id ] = $d;
+                $ref[ $d->id ] =& $ref[ $d->secondary_item_id ]->children[ $d->id ];
+
+            /* We don't have a reference on its parent, put it a root level */
+            } else {
+                $menu[ $d->id ] = $d;
+                $ref[ $d->id ] =& $menu[ $d->id ];
+            }
+        }
+
+        return $menu;
+    }
+
+    function rebuild_activity_comment_tree( $parent_id, $left = 1 ) {
+        global $wpdb, $bp;
+
+        /* The right value of this node is the left value + 1 */
+        $right = $left + 1;
+
+        /* Get all descendants of this node */
+        $descendants = $wpdb->get_results( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE component_action = 'activity_comment' AND secondary_item_id = %d", $parent_id ) );
+
+        /* Loop the descendants and recalculate the left and right values */
+        foreach ( $descendants as $descendant )
+            $right = BP_Activity_Activity::rebuild_activity_comment_tree( $descendant->id, $right );
+
+        /* We've got the left value, and now that we've processed the children of this node we also know the right value */
+        if ( 1 == $left )
+            $wpdb->query( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET mptt_left = %d, mptt_right = %d WHERE id = %d", $left, $right, $parent_id ) );
         else
-            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql" ) );
-
-        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 $filter_sql ORDER BY date_recorded DESC $max_sql" ) );
-
-        return array( 'activities' => $activities, 'total' => (int)$total_activities );
+            $wpdb->query( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET mptt_left = %d, mptt_right = %d WHERE component_action = 'activity_comment' AND id = %d", $left, $right, $parent_id ) );
+
+        /* Return the right value of this node + 1 */
+        return $right + 1;
     }
 
@@ -234 +360 @@
         global $wpdb, $bp;
 
-        $activities = bp_activity_get_sitewide_activity( $limit );
+        $activities = bp_activity_get_sitewide( array( 'max' => $limit ) );
+
         for ( $i = 0; $i < count($activities); $i++ ) {
                 $title = explode( '<span', $activities[$i]['content'] );

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

@@ -19 +19 @@
     $activity_allowedtags['span'] = array();
     $activity_allowedtags['span']['class'] = array();
+    $activity_allowedtags['div'] = array();
+    $activity_allowedtags['div']['class'] = array();
+    $activity_allowedtags['div']['id'] = array();
     $activity_allowedtags['a']['class'] = array();
     $activity_allowedtags['img'] = array();

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

@@ -17 +17 @@
     var $full_name;
 
-    function bp_activity_template( $type, $user_id, $per_page, $max, $filter ) {
+    function bp_activity_template( $type, $user_id, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments ) {
         global $bp;
 
@@ -24 +24 @@
         $this->activity_type = $type;
 
-        if ( $type == 'sitewide' )
-            $this->activities = bp_activity_get_sitewide_activity( $max, $this->pag_num, $this->pag_page, $filter );
-
-        if ( $type == 'personal' )
-            $this->activities = bp_activity_get_user_activity( $user_id, $max, $this->pag_num, $this->pag_page, $filter );
-
-        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 );
+        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 ) );
+        } 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 ) );
+
+            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 ) );
+
+            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 );
+        }
 
         if ( !$max || $max >= (int)$this->activities['total'] )
@@ -119 +124 @@
     $defaults = array(
         'type' => 'sitewide',
-        'per_page' => 25,
-        'max' => false,
+        '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
+        'per_page' => 25, // number of items per page
+        'max' => false, // max number to return
+
+        /* Filtering */
         'user_id' => false, // user_id to filter on
         'object' => false, // object to filter on e.g. groups, profile, status, friends
@@ -126 +136 @@
         'primary_id' => false, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
         'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
+
+        /* Searching */
+        'search_terms' => false // specify terms to search on
     );
 
@@ -144 +157 @@
         $filter = array( 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
 
-    $activities_template = new BP_Activity_Template( $type, $user_id, $per_page, $max, $filter );
+    $activities_template = new BP_Activity_Template( $type, $user_id, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments );
+
     return apply_filters( 'bp_has_activities', $activities_template->has_activities(), &$activities_template );
 }
@@ -197 +211 @@
 
         return apply_filters( 'bp_get_activities_no_activity', $bp_activity_no_activity );
+    }
+
+function bp_activity_id() {
+    echo bp_get_activity_id();
+}
+    function bp_get_activity_id() {
+        global $activities_template;
+        return apply_filters( 'bp_get_activity_id', $activities_template->activity->id );
+    }
+
+function bp_activity_item_id() {
+    echo bp_get_activity_item_id();
+}
+    function bp_get_activity_item_id() {
+        global $activities_template;
+        return apply_filters( 'bp_get_activity_item_id', $activities_template->activity->item_id );
+    }
+
+function bp_activity_secondary_item_id() {
+    echo bp_get_activity_secondary_item_id();
+}
+    function bp_get_activity_secondary_item_id() {
+        global $activities_template;
+        return apply_filters( 'bp_get_activity_secondary_item_id', $activities_template->activity->secondary_item_id );
+    }
+
+function bp_activity_date_recorded() {
+    echo bp_get_activity_date_recorded();
+}
+    function bp_get_activity_date_recorded() {
+        global $activities_template;
+        return apply_filters( 'bp_get_activity_date_recorded', $activities_template->activity->date_recorded );
+    }
+
+function bp_activity_object_name() {
+    echo bp_get_activity_object_name();
+}
+    function bp_get_activity_object_name() {
+        global $activities_template;
+        return apply_filters( 'bp_get_activity_object_name', $activities_template->activity->component_name );
+    }
+
+function bp_activity_action_name() {
+    echo bp_get_activity_action_name();
+}
+    function bp_get_activity_action_name() {
+        global $activities_template;
+        return apply_filters( 'bp_get_activity_action_name', $activities_template->activity->component_action );
     }
 
@@ -255 +317 @@
         $content = apply_filters( 'the_content', $content );
 
-        return apply_filters( 'bp_get_activity_content', $content );
+        return apply_filters( 'bp_get_activity_content', $content, $activities_template->activity->component_name, $activities_template->activity->component_action );
     }
 
@@ -299 +361 @@
     return apply_filters( 'bp_activity_content_filter', $content_new );
 }
+
+function bp_activity_comments( $args = '' ) {
+    echo bp_activity_get_comments( $args );
+}
+    function bp_activity_get_comments( $args = '' ) {
+        global $activities_template, $bp;
+
+        if ( !$activities_template->activity->children )
+            return false;
+
+        $comments_html = bp_activity_recurse_comments( $activities_template->activity );
+
+        return apply_filters( 'bp_activity_get_comments', $comments_html );
+    }
+        /* The HTML in this function is temporary, it will be move to template tags once comments are working. */
+        function bp_activity_recurse_comments( $comment ) {
+            global $activities_template, $bp;
+
+            if ( !$comment->children )
+                return false;
+
+            $content .= '<ul>';
+            foreach ( $comment->children as $comment ) {
+                $content .= '<li id="acomment-' . $comment->id . '">';
+
+                $content .= '<div class="acomment-avatar">' . bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'width' => 25, 'height' => 25 ) ) . '</div>';
+
+                $content .= '<div class="acomment-meta">' . bp_core_get_userlink( $comment->user_id ) . ' &middot; ' . sprintf( __( '%s ago', 'buddypress' ), bp_core_time_since( strtotime( $comment->date_recorded ) ) );
+
+                /* Reply link */
+                if ( is_user_logged_in() )
+                    $content .= ' &middot; <a href="#acomment-' . $comment->id . '" class="acomment-reply" id="acomment-reply-' . $activities_template->activity->id . '">' . __( 'Reply', 'buddypress' ) . '</a>';
+
+                /* Delete link */
+                if ( is_site_admin() || $bp->loggedin_user->id == $comment->user_id )
+                    $content .= ' &middot; <a href="' . wp_nonce_url( $bp->activity->id . '/delete/?cid=' . $comment->id, 'delete_activity_comment' ) . '" class="delete acomment-delete">' . __( 'Delete', 'buddypress' ) . '</a>';
+
+                $content .= '</div>';
+                $content .= '<div class="acomment-content">' . apply_filters( 'bp_get_activity_content', $comment->content ) . '</div>';
+
+                $content .= bp_activity_recurse_comments( $comment );
+                $content .= '</li>';
+            }
+            $content .= '</ul>';
+
+            return $content;
+        }
 
 function bp_activity_insert_time_since( $content, $date ) {
@@ -391 +500 @@
             $component_links[] = '<' . $tag . ' id="afilter-clear"><a href="' . attribute_escape( $link ) . '"">' . __( 'Clear Filter', 'buddypress' ) . '</a></' . $tag . '>';
 
-        return apply_filters( 'bp_get_activity_filter_links', implode( "\n", $component_links ) );
+        return apply_filters( 'bp_get_activity_filter_links', implode( "\n", $component_links ) );
     }
 

trunk/bp-activity/deprecated/bp-activity-deprecated.php

@@ -93 +93 @@
 add_action( 'bp_styles', 'bp_activity_add_structure_css' );
 
+/* DEPRECATED - use bp_activity_get_sitewide( $args ) */
+function bp_activity_get_sitewide_activity( $max_items = 30, $pag_num = false, $pag_page = false, $filter = false ) {
+    return apply_filters( 'bp_activity_get_sitewide_activity', bp_activity_get_sitewide( array( 'max' => $max_items, 'limit' => $pag_num, 'page' => $pag_page, 'filter' => $filter ) ), $max_items, $pag_num, $pag_page, $filter );
+}
+
+/* DEPRECATED - use bp_activity_get_for_user( $args ) */
+function bp_activity_get_user_activity( $user_id, $max = 30, $pag_num = false, $pag_page = false, $filter = false ) {
+    return apply_filters( 'bp_activity_get_user_activity', BP_Activity_Activity::get_activity_for_user( $user_id, $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments ), $user_id, $max_items, $pag_num, $pag_page, $filter );
+}
+
+
 ?>

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

@@ -5 +5 @@
 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;
 }
@@ -20 +20 @@
     global $current_user, $current_site;
     global $bp;
-        
+
     require_once( ABSPATH . WPINC . '/registration.php' );
 
@@ -48 +48 @@
             <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>
@@ -62 +62 @@
 function bp_blogs_signup_blog( $blogname = '', $blog_title = '', $errors = '' ) {
     global $current_site;
-    
+
     // Blog name
     if( 'no' == constant( "VHOST" ) )
@@ -90 +90 @@
     // Blog Title
     ?>
-    <label for="blog_title"><?php _e('Blog Title:', 'buddypress') ?></label>    
+    <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>
@@ -99 +99 @@
     <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'); ?> 
+        <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.', 'buddypress'); ?>
 
 
@@ -119 +119 @@
     global $wpdb, $current_user, $blogname, $blog_title, $errors, $domain, $path;
 
-    if ( !check_admin_referer( 'bp_blog_signup_form' ) ) 
+    if ( !check_admin_referer( 'bp_blog_signup_form' ) )
         return false;
 
     $current_user = wp_get_current_user();
-    
+
     if( !is_user_logged_in() )
         die();
@@ -137 +137 @@
 
     $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);
@@ -169 +169 @@
 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>' );
@@ -177 +177 @@
 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
 ?>
@@ -187 +187 @@
         <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> 
+        <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
@@ -202 +202 @@
     var $blogs;
     var $blog;
-    
+
     var $in_the_loop;
-    
+
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_blog_count;
-    
+
     function bp_blogs_user_blogs_template( $user_id, $per_page, $max ) {
         global $bp;
-        
+
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
@@ -223 +223 @@
             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'];
         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 ) );
-        
+
         if ( $max ) {
             if ( $max >= count($this->blogs) )
@@ -239 +239 @@
             $this->blog_count = count($this->blogs);
         }
-        
+
         $this->pag_links = paginate_links( array(
             'base' => add_query_arg( 'fpage', '%#%' ),
@@ -250 +250 @@
         ));
     }
-    
+
     function has_blogs() {
         if ( $this->blog_count )
             return true;
-        
+
         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;
@@ -271 +271 @@
         }
     }
-    
-    function user_blogs() { 
+
+    function user_blogs() {
         if ( $this->current_blog + 1 < $this->blog_count ) {
             return true;
@@ -284 +284 @@
         return false;
     }
-    
+
     function the_blog() {
         global $blog;
@@ -290 +290 @@
         $this->in_the_loop = true;
         $blog = $this->next_blog();
-        
+
         if ( 0 == $this->current_blog ) // loop has just started
             do_action('loop_start');
@@ -324 +324 @@
 function bp_blogs_pagination_count() {
     global $bp, $blogs_template;
-    
+
     $from_num = intval( ( $blogs_template->pag_page - 1 ) * $blogs_template->pag_num ) + 1;
     $to_num = ( $from_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $from_num + ( $blogs_template->pag_num - 1 ) ;
@@ -346 +346 @@
     function bp_get_blog_title() {
         global $blogs_template;
-            
-        return apply_filters( 'bp_get_blog_title', $blogs_template->blog['title'] );
+
+        return apply_filters( 'bp_get_blog_title', $blogs_template->blog->name );
     }
 
@@ -355 +355 @@
     function bp_get_blog_description() {
         global $blogs_template;
-        
-        return apply_filters( 'bp_get_blog_description', $blogs_template->blog['description'] );
+
+        return apply_filters( 'bp_get_blog_description', $blogs_template->blog->description );
     }
 
@@ -363 +363 @@
 }
     function bp_get_blog_permalink() {
-        global $blogs_template; 
-        
-        return apply_filters( 'bp_get_blog_permalink', $blogs_template->blog['siteurl'] );
+        global $blogs_template;
+
+        return apply_filters( 'bp_get_blog_permalink', $blogs_template->blog->siteurl );
     }
 
@@ -378 +378 @@
     var $posts;
     var $post;
-    
+
     var $in_the_loop;
-    
+
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_post_count;
-    
+
     function bp_blogs_blog_post_template( $user_id, $per_page, $max ) {
         global $bp;
-        
+
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
@@ -394 +394 @@
         $this->pag_page = isset( $_GET['fpage'] ) ? intval( $_GET['fpage'] ) : 1;
         $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $per_page;
-        
+
         if ( !$this->posts = wp_cache_get( 'bp_user_posts_' . $user_id, 'bp' ) ) {
             $this->posts = bp_blogs_get_posts_for_user( $user_id );
             wp_cache_set( 'bp_user_posts_' . $user_id, $this->posts, 'bp' );
         }
-        
+
         if ( !$max || $max >= (int)$this->posts['count'] )
             $this->total_post_count = (int)$this->posts['count'];
         else
             $this->total_post_count = (int)$max;
-        
+
         $this->posts = array_slice( (array)$this->posts['posts'], intval( ( $this->pag_page - 1 ) * $this->pag_num), intval( $this->pag_num ) );
 
@@ -415 +415 @@
             $this->post_count = count($this->posts);
         }
-        
+
         $this->pag_links = paginate_links( array(
             'base' => add_query_arg( 'fpage', '%#%' ),
@@ -424 +424 @@
             'next_text' => '&raquo;',
             'mid_size' => 1
-        )); 
-    }
-    
+        ));
+    }
+
     function has_posts() {
         if ( $this->post_count )
             return true;
-        
+
         return false;
     }
-    
+
     function next_post() {
         $this->current_post++;
         $this->post = $this->posts[$this->current_post];
-        
+
         return $this->post;
     }
-    
+
     function rewind_posts() {
         $this->current_post = -1;
@@ -447 +447 @@
         }
     }
-    
-    function user_posts() { 
+
+    function user_posts() {
         if ( $this->current_post + 1 < $this->post_count ) {
             return true;
@@ -460 +460 @@
         return false;
     }
-    
+
     function the_post() {
         global $post;
@@ -466 +466 @@
         $this->in_the_loop = true;
         $post = $this->next_post();
-        
+
         if ( 0 == $this->current_post ) // loop has just started
             do_action('loop_start');
@@ -484 +484 @@
     extract( $r, EXTR_SKIP );
 
-    $posts_template = new BP_Blogs_Blog_Post_Template( $user_id, $per_page, $max ); 
+    $posts_template = new BP_Blogs_Blog_Post_Template( $user_id, $per_page, $max );
     return apply_filters( 'bp_has_posts', $posts_template->has_posts(), &$posts_template );
 }
@@ -500 +500 @@
 function bp_post_pagination_count() {
     global $bp, $posts_template;
-    
+
     $from_num = intval( ( $posts_template->pag_page - 1 ) * $posts_template->pag_num ) + 1;
     $to_num = ( $from_num + ( $posts_template->pag_num - 1 ) > $posts_template->total_post_count ) ? $posts_template->total_post_count : $from_num + ( $posts_template->pag_num - 1 ) ;
@@ -522 +522 @@
     function bp_get_post_id() {
         global $posts_template;
-        return apply_filters( 'bp_get_post_id', $posts_template->post->ID );    
-    }
-    
+        return apply_filters( 'bp_get_post_id', $posts_template->post->ID );
+    }
+
 function bp_post_title( $deprecated = true ) {
     if ( !$deprecated )
@@ -533 +533 @@
     function bp_get_post_title() {
         global $posts_template;
-        
+
         return apply_filters( 'bp_get_post_title', $posts_template->post->post_title );
     }
@@ -539 +539 @@
 function bp_post_permalink() {
     global $posts_template;
-    
-    echo bp_post_get_permalink();   
+
+    echo bp_post_get_permalink();
 }
 
 function bp_post_excerpt() {
-    echo bp_get_post_excerpt(); 
+    echo bp_get_post_excerpt();
 }
     function bp_get_post_excerpt() {
         global $posts_template;
-        echo apply_filters( 'bp_get_post_excerpt', $posts_template->post->post_excerpt );   
+        echo apply_filters( 'bp_get_post_excerpt', $posts_template->post->post_excerpt );
     }
 
@@ -567 +567 @@
     function bp_get_post_status() {
         global $posts_template;
-        return apply_filters( 'bp_get_post_status', $posts_template->post->post_status );   
-    }
-    
+        return apply_filters( 'bp_get_post_status', $posts_template->post->post_status );
+    }
+
 function bp_post_date( $date_format = null, $deprecated = true ) {
     if ( !$date_format )
         $date_format = get_option('date_format');
-        
+
     if ( !$deprecated )
         return bp_get_post_date( $date_format );
@@ -593 +593 @@
     function bp_get_post_comment_count() {
         global $posts_template;
-        return apply_filters( 'bp_get_post_comment_count', $posts_template->post->comment_count );  
+        return apply_filters( 'bp_get_post_comment_count', $posts_template->post->comment_count );
     }
 
 function bp_post_comments( $zero = 'No Comments', $one = '1 Comment', $more = '% Comments', $css_class = '', $none = 'Comments Off' ) {
     global $posts_template, $wpdb;
-    
+
     $number = (int)$posts_template->post->comment_count;
-    
+
     if ( 0 == $number && 'closed' == $posts_template->postcomment_status && 'closed' == $posts_template->postping_status ) {
         echo '<span' . ((!empty($css_class)) ? ' class="' . $css_class . '"' : '') . '>' . $none . '</span>';
@@ -614 +614 @@
 
     echo '<a href="';
-    
+
     if ( 0 == $number )
         echo bp_post_get_permalink() . '#respond';
@@ -620 +620 @@
         echo bp_post_get_permalink() . '#comments';
     echo '"';
-    
+
     if ( !empty( $css_class ) ) {
         echo ' class="'.$css_class.'" ';
@@ -629 +629 @@
 
     echo ' title="' . sprintf( __('Comment on %s', 'buddypress'), $title ) . '">';
-    
+
     if ( 1 == $number )
         printf( __( '%d Comment', 'buddypress' ), $number );
     else
         printf( __( '%d Comments', 'buddypress' ), $number );
-        
+
     echo '</a>';
 }
@@ -646 +646 @@
     function bp_get_post_author() {
         global $posts_template;
-        
+
         return apply_filters( 'bp_get_post_author', bp_core_get_userlink( $posts_template->post->post_author ) );
     }
@@ -664 +664 @@
             $post_id = $posts_template->post->ID;
 
-        return apply_filters( 'bp_get_post_category', get_the_category_list( $separator, $parents, $post_id ) );    
+        return apply_filters( 'bp_get_post_category', get_the_category_list( $separator, $parents, $post_id ) );
     }
 
 function bp_post_tags( $before = '', $sep = ', ', $after = '' ) {
     global $posts_template, $wpdb;
-    
+
     /* Disabling this for now as it's too expensive and there is no global tags directory */
     return false;
-    
+
     switch_to_blog( $posts_template->post->blog_id );
     $terms = bp_post_get_term_list( $before, $sep, $after );
@@ -692 +692 @@
     function bp_get_post_blog_name() {
         global $posts_template;
-        return apply_filters( 'bp_get_post_blog_name', get_blog_option( $posts_template->post->blog_id, 'blogname' ) ); 
+        return apply_filters( 'bp_get_post_blog_name', get_blog_option( $posts_template->post->blog_id, 'blogname' ) );
     }
 
 function bp_post_blog_permalink() {
-    echo bp_get_post_blog_permalink();  
+    echo bp_get_post_blog_permalink();
 }
     function bp_get_post_blog_permalink() {
         global $posts_template;
-        return apply_filters( 'bp_get_post_blog_permalink', get_blog_option( $posts_template->post->blog_id, 'siteurl' ) ); 
-    }
-    
+        return apply_filters( 'bp_get_post_blog_permalink', get_blog_option( $posts_template->post->blog_id, 'siteurl' ) );
+    }
+
 function bp_post_get_permalink( $post = null, $blog_id = null ) {
     global $current_blog, $posts_template;
-    
+
     if ( !$post )
-        $post = $posts_template->post;  
-        
+        $post = $posts_template->post;
+
     if ( !$blog_id )
         $blog_id = $posts_template->post->blog_id;
-        
+
     if ( !$post || !$blog_id )
         return false;
-        
+
     $rewritecode = array(
         '%year%',
@@ -735 +735 @@
 
     $permalink = get_blog_option( $blog_id, 'permalink_structure' );
-    $site_url = get_blog_option( $blog_id, 'siteurl' ); 
+    $site_url = get_blog_option( $blog_id, 'siteurl' );
 
     if ( '' != $permalink && !in_array($post->post_status, array('draft', 'pending')) ) {
@@ -753 +753 @@
             if ( empty($category) ) {
                 $default_category = get_category( get_option( 'default_category' ) );
-                $category = is_wp_error( $default_category ) ? '' : $default_category->slug; 
+                $category = is_wp_error( $default_category ) ? '' : $default_category->slug;
             }
         }
@@ -789 +789 @@
 function bp_post_get_term_list( $before = '', $sep = '', $after = '' ) {
     global $posts_template;
-    
+
     $terms = get_the_terms( $posts_template->post->ID, 'post_tag' );
 
@@ -801 +801 @@
         $link = get_blog_option( BP_ROOT_BLOG, 'siteurl') . '/tag/' . $term->slug;
         $link = apply_filters('term_link', $link);
-        
+
         $term_links[] = '<a href="' . $link . '" rel="tag">' . $term->name . '</a>';
     }
@@ -820 +820 @@
     var $comments;
     var $comment;
-    
+
     var $in_the_loop;
-    
+
     var $pag_page;
     var $pag_num;
     var $pag_links;
     var $total_comment_count;
-    
+
     function bp_blogs_post_comment_template( $user_id, $per_page, $max ) {
         global $bp;
-        
+
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
@@ -836 +836 @@
         $this->pag_page = isset( $_GET['compage'] ) ? intval( $_GET['compage'] ) : 1;
         $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $per_page;
-        
+
         if ( !$this->comments = wp_cache_get( 'bp_user_comments_' . $user_id, 'bp' ) ) {
             $this->comments = bp_blogs_get_comments_for_user( $user_id );
             wp_cache_set( 'bp_user_comments_' . $user_id, $this->comments, 'bp' );
         }
-        
+
         if ( !$max || $max >= (int)$this->comments['count'] )
             $this->total_comment_count = (int)$this->comments['count'];
         else
             $this->total_comment_count = (int)$max;
-        
+
         $this->comments = array_slice( (array)$this->comments['comments'], intval( ( $this->pag_page - 1 ) * $this->pag_num), intval( $this->pag_num ) );
 
@@ -857 +857 @@
             $this->comment_count = count($this->comments);
         }
-        
+
         $this->pag_links = paginate_links( array(
             'base' => add_query_arg( 'compage', '%#%' ),
@@ -867 +867 @@
             'mid_size' => 1
         ));
-                
-    }
-    
+
+    }
+
     function has_comments() {
         if ( $this->comment_count )
             return true;
-        
+
         return false;
     }
-    
+
     function next_comment() {
         $this->current_comment++;
         $this->comment = $this->comments[$this->current_comment];
-        
+
         return $this->comment;
     }
-    
+
     function rewind_comments() {
         $this->current_comment = -1;
@@ -890 +890 @@
         }
     }
-    
-    function user_comments() { 
+
+    function user_comments() {
         if ( $this->current_comment + 1 < $this->comment_count ) {
             return true;
@@ -903 +903 @@
         return false;
     }
-    
+
     function the_comment() {
         global $comment;
@@ -909 +909 @@
         $this->in_the_loop = true;
         $comment = $this->next_comment();
-        
+
         if ( 0 == $this->current_comment ) // loop has just started
             do_action('loop_start');
@@ -926 +926 @@
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
-    
+
     $comments_template = new BP_Blogs_Post_Comment_Template( $user_id, $per_page, $max );
     return apply_filters( 'bp_has_comments', $comments_template->has_comments(), &$comments_template );
@@ -946 +946 @@
     function bp_get_comments_pagination() {
         global $comments_template;
-        
+
         return apply_filters( 'bp_get_comments_pagination', $comments_template->pag_links );
     }
@@ -966 +966 @@
     function bp_get_comment_post_permalink() {
         global $comments_template;
-        
+
         return apply_filters( 'bp_get_comment_post_permalink', bp_post_get_permalink( $comments_template->comment->post, $comments_template->comment->blog_id ) . '#comment-' . $comments_template->comment->comment_ID );
     }
@@ -978 +978 @@
     function bp_get_comment_post_title( $deprecated = true ) {
         global $comments_template;
-        
+
         return apply_filters( 'bp_get_comment_post_title', $comments_template->comment->post->post_title );
     }
@@ -984 +984 @@
 function bp_comment_author( $deprecated = true ) {
     global $comments_template;
-    
+
     if ( !$deprecated )
         return bp_get_comment_author();
@@ -1010 +1010 @@
     if ( !$date_format )
         $date_format = get_option('date_format');
-        
+
     if ( !$deprecated )
         return bp_get_comment_date( $date_format );
-    else 
+    else
         echo bp_get_comment_date( $date_format );
 }
@@ -1027 +1027 @@
 function bp_comment_blog_permalink( $deprecated = true ) {
     if ( !$deprecated )
-        return bp_get_comment_blog_permalink(); 
+        return bp_get_comment_blog_permalink();
     else
         echo bp_get_comment_blog_permalink();
@@ -1039 +1039 @@
 function bp_comment_blog_name( $deprecated = true ) {
     global $comments_template;
-    
+
     if ( !$deprecated )
-        return bp_get_comment_blog_permalink(); 
+        return bp_get_comment_blog_permalink();
     else
-        echo bp_get_comment_blog_permalink();   
+        echo bp_get_comment_blog_permalink();
 }
     function bp_get_comment_blog_name( $deprecated = true ) {
@@ -1060 +1060 @@
     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;
@@ -1073 +1073 @@
         $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 );
@@ -1083 +1083 @@
                     $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;  
-                
+                    break;
+
                 case 'active': default:
                     $this->blogs = BP_Blogs_Blog::get_active( $this->pag_num, $this->pag_page );
-                    break;                  
+                    break;
             }
         }
-        
+
         if ( !$max || $max >= (int)$this->blogs['total'] )
             $this->total_blog_count = (int)$this->blogs['total'];
@@ -1109 +1109 @@
             $this->blog_count = count($this->blogs);
         }
-        
+
         $this->pag_links = paginate_links( array(
             'base' => add_query_arg( 'bpage', '%#%' ),
@@ -1118 +1118 @@
             'next_text' => '&raquo;',
             'mid_size' => 1
-        ));     
-    }
-    
+        ));
+    }
+
     function has_blogs() {
         if ( $this->blog_count )
             return true;
-        
+
         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;
@@ -1141 +1141 @@
         }
     }
-    
-    function blogs() { 
+
+    function blogs() {
         if ( $this->current_blog + 1 < $this->blog_count ) {
             return true;
@@ -1154 +1154 @@
         return false;
     }
-    
+
     function the_blog() {
         global $blog;
@@ -1160 +1160 @@
         $this->in_the_loop = true;
         $this->blog = $this->next_blog();
-        
+
         if ( 0 == $this->current_blog ) // loop has just started
             do_action('loop_start');
@@ -1168 +1168 @@
 function bp_rewind_site_blogs() {
     global $site_blogs_template;
-    
-    $site_blogs_template->rewind_blogs();   
+
+    $site_blogs_template->rewind_blogs();
 }
 
@@ -1183 +1183 @@
     $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 );
 
@@ -1198 +1198 @@
 function bp_site_blogs() {
     global $site_blogs_template;
-    
+
     return $site_blogs_template->blogs();
 }
@@ -1204 +1204 @@
 function bp_the_site_blog() {
     global $site_blogs_template;
-    
+
     return $site_blogs_template->the_blog();
 }
@@ -1210 +1210 @@
 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 ) ;
@@ -1226 +1226 @@
         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();
@@ -1232 +1232 @@
     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.
@@ -1309 +1309 @@
         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" />';

trunk/bp-core.php

@@ -533 +533 @@
  * @uses get_usermeta() WordPress function to get the usermeta for a user.
  */
-function bp_core_get_user_domain( $user_id ) {
+function bp_core_get_user_domain( $user_id, $user_nicename = false, $user_login = false ) {
     global $bp;
 
     if ( !$user_id ) return;
 
-    $ud = get_userdata($user_id);
+    if ( $domain = wp_cache_get( 'bp_user_domain_' . $user_id, 'bp' ) )
+        return apply_filters( 'bp_core_get_user_domain', $domain );
+
+    if ( !$user_nicename && !$user_login ) {
+        $ud = get_userdata($user_id);
+        $user_nicename = $ud->user_nicename;
+        $user_login = $ud->user_login;
+    }
 
     if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) )
-        $username = $ud->user_login;
+        $username = $user_login;
     else
-        $username = $ud->user_nicename;
+        $username = $user_nicename;
 
     /* If we are using a members slug, include it. */
     if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) )
-        return apply_filters( 'bp_core_get_user_domain', $bp->root_domain . '/' . BP_MEMBERS_SLUG . '/' . $username . '/' );
+        $domain = $bp->root_domain . '/' . BP_MEMBERS_SLUG . '/' . $username . '/';
     else
-        return apply_filters( 'bp_core_get_user_domain', $bp->root_domain . '/' . $username . '/' );
+        $domain = $bp->root_domain . '/' . $username . '/';
+
+    /* Cache the link */
+    wp_cache_set( 'bp_user_domain_' . $user_id, $domain, 'bp' );
+
+    return apply_filters( 'bp_core_get_user_domain', $domain );
 }
 
@@ -721 +733 @@
 }
 add_action( 'wp_head', 'bp_core_sort_nav_items' );
-
-/**
- * bp_core_remove_nav_item()
- *
- * Removes a navigation item from the main navigation array.
- *
- * @package BuddyPress Core
- * @param $slug The slug of the sub navigation item.
- */
-function bp_core_remove_nav_item( $slug ) {
-    global $bp;
-
-    unset( $bp->bp_nav[$slug] );
-}
 
 /**
@@ -820 +818 @@
 
 /**
- * bp_core_remove_subnav_item()
+ * bp_core_remove_nav_item()
  *
  * Removes a navigation item from the sub navigation array used in BuddyPress themes.
@@ -828 +826 @@
  * @param $slug The slug of the sub navigation item.
  */
+function bp_core_remove_nav_item( $parent_id ) {
+    global $bp;
+
+    /* Unset subnav items for this nav item */
+    foreach( $bp->bp_options_nav[$parent_id] as $subnav_item ) {
+        bp_core_remove_subnav_item( $parent_id, $subnav_item['slug'] );
+    }
+
+    unset( $bp->bp_nav[$parent_id] );
+}
+
+/**
+ * bp_core_remove_subnav_item()
+ *
+ * Removes a navigation item from the sub navigation array used in BuddyPress themes.
+ *
+ * @package BuddyPress Core
+ * @param $parent_id The id of the parent navigation item.
+ * @param $slug The slug of the sub navigation item.
+ */
 function bp_core_remove_subnav_item( $parent_id, $slug ) {
     global $bp;
 
+    $function = $bp->bp_options_nav[$parent_id][$slug]['screen_function'];
+
+    if ( $function ) {
+        if ( !is_object( $screen_function[0] ) )
+            remove_action( 'wp', $screen_function, 3 );
+        else
+            remove_action( 'wp', array( &$screen_function[0], $screen_function[1] ), 3 );
+    }
+
     unset( $bp->bp_options_nav[$parent_id][$slug] );
+
+    if ( !count( $bp->bp_options_nav[$parent_id] ) )
+        unset($bp->bp_options_nav[$parent_id]);
 }
 
@@ -979 +1009 @@
     global $bp;
 
-    if ( !is_numeric($uid) )
-        return false;
-
-    return apply_filters( 'bp_core_get_userurl', bp_core_get_user_domain( $uid ) );
+    if ( !$url = wp_cache_get( 'bp_user_url_' . $uid, 'bp' ) ) {
+        $url = bp_core_get_user_domain( $uid );
+    }
+
+    return apply_filters( 'bp_core_get_userurl', $url );
 }
 
@@ -997 +1028 @@
  */
 function bp_core_get_user_email( $uid ) {
-    $ud = get_userdata($uid);
-    return apply_filters( 'bp_core_get_user_email', $ud->user_email );
+    if ( !$email = wp_cache_get( 'bp_user_email_' . $uid, 'bp' ) ) {
+        $ud = get_userdata($uid);
+        $email = $ud->user_email;
+    }
+    return apply_filters( 'bp_core_get_user_email', $email );
 }
 
@@ -1031 +1065 @@
         return false;
 
-    if ( function_exists('bp_fetch_user_fullname') ) {
+    if ( function_exists( 'bp_core_get_user_displayname' ) ) {
         $display_name = bp_core_get_user_displayname( $user_id );
 
@@ -1050 +1084 @@
         return $url;
 
-    return '<a href="' . $url . '">' . $display_name . '</a>';
+    return apply_filters( 'bp_core_get_userlink', '<a href="' . $url . '">' . $display_name . '</a>', $user_id );
 }
 
@@ -1666 +1700 @@
     global $wpdb;
     ?>
-<!-- Generated in <?php timer_stop(1); ?> seconds. -->
+<!-- Generated in <?php timer_stop(1); ?> seconds. <?php echo get_num_queries(); ?> -->
     <?php
 }

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

@@ -130 +130 @@
 
         if ( 'user' == $object ) {
-            $ud = get_userdata( $item_id );
-            $grav_email = $ud->user_email;
+            $grav_email = bp_core_get_user_email( $item_id );
         } else if ( 'group' == $object || 'blog' == $object ) {
             $grav_email = "{$item_id}-{$object}@{$bp->root_domain}";
@@ -140 +139 @@
 
         return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' id='{$css_id}' class='{$class}'{$html_width}{$html_height} />", $params );
+
     } else if ( !file_exists( $avatar_url ) && $no_grav )
         return false;

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

@@ -254 +254 @@
         bp_core_redirect( $bp->root_domain );
 
+    // If the template file doesn't exist, redirect to the root domain.
+    if ( !bp_is_blog_page() && !file_exists( locate_template( array( $bp_path . '.php' ), false ) ) )
+        bp_core_redirect( $bp->root_domain );
+
     if ( !$bp_path && !bp_is_blog_page() ) {
         if ( is_user_logged_in() ) {

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

@@ -57 +57 @@
      */
     function populate() {
-        $this->user_url = bp_core_get_userurl( $this->id );
-        $this->user_link = bp_core_get_userlink( $this->id );
-
-        $this->fullname = attribute_escape( bp_core_get_user_displayname( $this->id ) );
-        $this->email = attribute_escape( bp_core_get_user_email( $this->id ) );
-        $this->last_active = attribute_escape( bp_core_get_last_activity( get_usermeta( $this->id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) ) );
+        if ( function_exists( 'xprofile_install' ) )
+            $this->profile_data = $this->get_profile_data();
+
+        if ( $this->profile_data ) {
+            $this->user_url = bp_core_get_user_domain( $this->id, $this->profile_data['user_nicename'], $this->profile_data['user_login'] );
+            $this->fullname = attribute_escape( $this->profile_data[BP_XPROFILE_FULLNAME_FIELD_NAME]['field_data'] );
+            $this->user_link = "<a href='{$this->user_url}'>{$this->fullname}</a>";
+            $this->email = attribute_escape( $this->profile_data['user_email'] );
+        } else {
+            $this->user_url = bp_core_get_userurl( $this->id );
+            $this->user_link = bp_core_get_userlink( $this->id );
+            $this->fullname = attribute_escape( bp_core_get_user_displayname( $this->id ) );
+            $this->email = attribute_escape( bp_core_get_user_email( $this->id ) );
+        }
+
+        /* Cache a few things that are fetched often */
+        wp_cache_set( 'bp_user_fullname_' . $this->id, $this->fullname, 'bp' );
+        wp_cache_set( 'bp_user_email_' . $this->id, $this->email, 'bp' );
+        wp_cache_set( 'bp_user_url_' . $this->id, $this->user_url, 'bp' );
 
         $this->avatar = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full' ) );
@@ -72 +85 @@
         global $bp;
 
-        if ( function_exists('friends_install') ) {
+        if ( function_exists('friends_install') )
             $this->total_friends = BP_Friends_Friendship::total_friend_count( $this->id );
 
-            if ( $this->total_friends ) {
-                if ( 1 == $this->total_friends )
-                    $this->total_friends .= ' ' . __( 'friend', 'buddypress' );
-                else
-                    $this->total_friends .= ' ' . __( 'friends', 'buddypress' );
-
-                $this->total_friends = '<a href="' . $this->user_url . $bp->friends->slug . '" title="' . sprintf( __( "%s's friend list", 'buddypress' ), $this->fullname ) . '">' . $this->total_friends . '</a>';
-            }
-        }
-
-        if ( function_exists('bp_blogs_install') ) {
-            if ( $this->total_blogs ) {
-                if ( 1 == $this->total_blogs )
-                    $this->total_blogs .= ' ' . __( 'blog', 'buddypress' );
-                else
-                    $this->total_blogs .= ' ' . __( 'blogs', 'buddypress' );
-
-                $this->total_blogs = '<a href="' . $this->user_url . $bp->blogs->slug . '" title="' . sprintf( __( "%s's blog list", 'buddypress' ), $this->fullname ) . '">' . $this->total_blogs . '</a>';
-            }
-        }
-
-        if ( function_exists('groups_install') ) {
+        if ( function_exists('groups_install') )
             $this->total_groups = BP_Groups_Member::total_group_count( $this->id );
-
-            if ( $this->total_groups ) {
-                if ( 1 == $this->total_groups )
-                    $this->total_groups .= ' ' . __( 'group', 'buddypress' );
-                else
-                    $this->total_groups .= ' ' . __( 'groups', 'buddypress' );
-
-                $this->total_groups = '<a href="' . $this->user_url . $bp->groups->slug . '" title="' . sprintf( __( "%s's group list", 'buddypress' ), $this->fullname ) . '">' . $this->total_groups . '</a>';
-            }
-        }
+    }
+
+    function get_profile_data() {
+        return BP_XProfile_ProfileData::get_all_for_user( $this->id );
     }
 

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

@@ -1054 +1054 @@
     }
 
-function bp_the_site_member_avatar() {
-    echo apply_filters( 'bp_the_site_member_avatar', bp_get_the_site_member_avatar() );
-}
-    function bp_get_the_site_member_avatar() {
-        global $site_members_template;
-
-        return apply_filters( 'bp_get_the_site_member_avatar', $site_members_template->member->avatar_thumb );
+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 );
     }
 
@@ -1089 +1105 @@
         global $site_members_template;
 
-        return apply_filters( 'bp_the_site_member_last_active', $site_members_template->member->last_active );
+        $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'] );
     }
 
@@ -1208 +1238 @@
 }
     function bp_displayed_user_fullname() {
-        return bp_user_fullname();
+        global $bp;
+
+        return apply_filters( 'bp_displayed_user_fullname', $bp->displayed_user->fullname );
     }
 

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

@@ -332 +332 @@
     $blog_title = $filtered_results['blog_title'];
     $errors = $filtered_results['errors'];
-
+    
     if ( empty($blogname) )
         $blogname = $user_name;

trunk/bp-groups.php

@@ -110 +110 @@
             item_id bigint(20) NOT NULL,
             user_id bigint(20) NOT NULL,
+            parent_id bigint(20) NOT NULL,
             content longtext NOT NULL,
             date_posted datetime NOT NULL,
             KEY item_id (item_id),
-            KEY user_id (user_id)
+            KEY user_id (user_id),
+            KEY parent_id (parent_id)
            ) {$charset_collate};";
 

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

@@ -706 +706 @@
             $hidden_sql = " AND g.status != 'hidden'";
 
-        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT 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_confirmed = 1 ORDER BY m.date_modified DESC {$pag_sql}", $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}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 ORDER BY m.date_modified DESC {$pag_sql}", $user_id ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(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_confirmed = 1 ORDER BY m.date_modified DESC", $user_id ) );
 
@@ -726 +726 @@
             $hidden_sql = " AND g.status != 'hidden'";
 
-        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT 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 {$pag_sql}", $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}{$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 DISTINCT count(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 ) );
 
@@ -746 +746 @@
             $hidden_sql = " AND g.status != 'hidden'";
 
-        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT 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 {$pag_sql}", $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}{$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 DISTINCT count(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 ) );
 
@@ -766 +766 @@
             $hidden_sql = " AND g.status != 'hidden'";
 
-        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT 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 {$pag_sql}", $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}{$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 DISTINCT count(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 ) );
 
@@ -786 +786 @@
             $hidden_sql = " AND g.status != 'hidden'";
 
-        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT 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 {$pag_sql}", $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}{$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 DISTINCT count(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 ) );
 
@@ -806 +806 @@
             $hidden_sql = " AND g.status != 'hidden'";
 
-        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT 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_mod = 1 ORDER BY date_modified ASC {$pag_sql}", $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}{$filter_sql} AND m.user_id = %d AND m.inviter_id = 0 AND m.is_banned = 0 AND m.is_mod = 1 ORDER BY m.date_modified ASC {$pag_sql}", $user_id ) );
         $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(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_mod = 1 ORDER BY date_modified ASC", $user_id ) );
 

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

@@ -247 +247 @@
         $this->group = $this->next_group();
 
-        // If this is a single group then instantiate group meta when creating the object.
-        if ( $this->single_group ) {
-            if ( !$group = wp_cache_get( 'groups_group_' . $this->group->group_id, 'bp' ) ) {
-                $group = new BP_Groups_Group( $this->group->group_id, true );
-                wp_cache_set( 'groups_group_' . $this->group->group_id, $group, 'bp' );
-            }
-        } else {
-            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 ( $this->single_group )
+            $this->group = new BP_Groups_Group( $this->group->group_id, true, true );
 
         if ( 0 == $this->current_group ) // loop has just started
@@ -282 +270 @@
     extract( $r, EXTR_SKIP );
 
-    /* The following code will auto set parameters based on the page being viewed.
-     * for example on example.com/members/andy/groups/my-groups/most-popular/
-     * $type = 'most-popular'
-     */
-    if ( 'my-groups' == $bp->current_action ) {
-        $order = $bp->action_variables[0];
-        if ( 'recently-joined' == $order )
-            $type = 'recently-joined';
-        else if ( 'most-popular' == $order )
-            $type = 'popular';
-        else if ( 'admin-of' == $order )
-            $type = 'admin-of';
-        else if ( 'mod-of' == $order )
-            $type = 'mod-of';
-        else if ( 'alphabetically' == $order )
-            $type = 'alphabetical';
-    } else if ( 'invites' == $bp->current_action ) {
-        $type = 'invites';
-    } else if ( $bp->groups->current_group->slug ) {
-        $type = 'single-group';
-        $slug = $bp->groups->current_group->slug;
+    if ( '' == $args ) {
+        /* The following code will auto set parameters based on the page being viewed.
+         * for example on example.com/members/andy/groups/my-groups/most-popular/
+         * $type = 'most-popular'
+         */
+        if ( 'my-groups' == $bp->current_action ) {
+            $order = $bp->action_variables[0];
+            if ( 'recently-joined' == $order )
+                $type = 'recently-joined';
+            else if ( 'most-popular' == $order )
+                $type = 'popular';
+            else if ( 'admin-of' == $order )
+                $type = 'admin-of';
+            else if ( 'mod-of' == $order )
+                $type = 'mod-of';
+            else if ( 'alphabetically' == $order )
+                $type = 'alphabetical';
+        } else if ( 'invites' == $bp->current_action ) {
+            $type = 'invites';
+        } else if ( $bp->groups->current_group->slug ) {
+            $type = 'single-group';
+            $slug = $bp->groups->current_group->slug;
+        }
     }
 
@@ -470 +460 @@
             $group =& $groups_template->group;
 
-        $last_active = groups_get_groupmeta( $group->id, 'last_activity' );
+        $last_active = $group->last_activity;
+
+        if ( !$last_active )
+            $last_active = groups_get_groupmeta( $group->id, 'last_activity' );
 
         if ( empty( $last_active ) ) {
@@ -1997 +1990 @@
     }
 
-function bp_the_site_group_avatar() {
-    echo bp_get_the_site_group_avatar();
-}
-    function bp_get_the_site_group_avatar() {
+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;
 
-        return apply_filters( 'bp_the_site_group_avatar', bp_core_fetch_avatar( array( 'item_id' => $site_groups_template->group->id, 'object' => 'group', 'type' => 'full', 'avatar_dir' => 'group-avatars', 'alt' => __( 'Group Avatar', 'buddypress' ) ) ) );
+        $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 ) ) );
     }
 

trunk/bp-xprofile.php

@@ -1 +1 @@
 <?php
-define ( 'BP_XPROFILE_DB_VERSION', '1800' );
+define ( 'BP_XPROFILE_DB_VERSION', '1850' );
 
 /* Define the slug for the component */
@@ -110 +110 @@
                item_id bigint(20) NOT NULL,
                user_id bigint(20) NOT NULL,
+               parent_id bigint(20) NOT NULL,
                content longtext NOT NULL,
                date_posted datetime NOT NULL,
                KEY item_id (item_id),
-               KEY user_id (user_id)
+               KEY user_id (user_id),
+               KEY parent_id (parent_id)
                ) {$charset_collate};";
 
@@ -530 +532 @@
         return false;
 
-    if ( !$wire_post = bp_wire_new_post( $bp->displayed_user->id, $_POST['wire-post-textarea'], $bp->profile->slug, false, $bp->profile->table_name_wire ) ) {
+    if ( !$wire_post = bp_wire_new_post( $bp->displayed_user->id, $_POST['wire-post-textarea'], $bp->profile->id ) ) {
         bp_core_add_message( __( 'Wire message could not be posted. Please try again.', 'buddypress' ), 'error' );
     } else {

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

@@ -719 +719 @@
     /** Static Functions **/
 
+    /**
+     * BP_XProfile_ProfileData::get_all_for_user()
+     *
+     * Get all of the profile information for a specific user.
+     */
+    function get_all_for_user( $user_id ) {
+        global $wpdb, $bp;
+
+        $results = $wpdb->get_results( $wpdb->prepare( "SELECT g.name as field_group_name, f.name as field_name, f.type as field_type, d.value as field_data, u.user_login, u.user_nicename, u.user_email FROM {$bp->profile->table_name_groups} g LEFT JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id INNER JOIN {$bp->profile->table_name_data} d ON f.id = d.field_id LEFT JOIN {$wpdb->users} u ON d.user_id = u.ID WHERE d.user_id = %d AND d.value != ''", $user_id ) );
+
+        if ( $results ) {
+            $profile_data['user_login'] = $results[0]->user_login;
+            $profile_data['user_nicename'] = $results[0]->user_nicename;
+            $profile_data['user_email'] = $results[0]->user_email;
+
+            foreach( (array) $results as $field ) {
+                $profile_data[$field->field_name] = array( 'field_group' => $field->field_group_name, 'field_type' => $field->field_type, 'field_data' => $field->field_data );
+            }
+        }
+
+        return $profile_data;
+    }
+
     function get_value_byid( $field_id, $user_id = null ) {
         global $wpdb, $bp;

trunk/bp-xprofile/bp-xprofile-filters.php

@@ -3 +3 @@
 /* Apply WordPress defined filters */
 add_filter( 'bp_get_the_profile_field_value', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_the_site_member_profile_data', 'wp_filter_kses', 1 );
 add_filter( 'xprofile_get_field_data', 'wp_filter_kses', 1 );
 add_filter( 'xprofile_field_name_before_save', 'wp_filter_kses', 1 );
@@ -20 +21 @@
 add_filter( 'bp_get_the_profile_field_value', 'force_balance_tags' );
 
+add_filter( 'bp_get_the_site_member_profile_data', 'wptexturize' );
+add_filter( 'bp_get_the_site_member_profile_data', 'convert_smilies', 2 );
+add_filter( 'bp_get_the_site_member_profile_data', 'convert_chars' );
+add_filter( 'bp_get_the_site_member_profile_data', 'make_clickable' );
+add_filter( 'bp_get_the_site_member_profile_data', 'force_balance_tags' );
+
 add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_format_field_value', 1, 2 );
+add_filter( 'bp_get_the_site_member_profile_data', 'xprofile_filter_format_field_value', 1, 2 );
 add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_link_profile_data', 2, 2 );
 
@@ -27 +35 @@
 add_filter( 'xprofile_get_field_data', 'stripslashes' );
 add_filter( 'bp_get_the_profile_field_description', 'stripslashes' );
+add_filter( 'bp_get_the_site_member_profile_data', 'stripslashes' );
 
 /* Custom BuddyPress filters */