Changeset 3232

Timestamp:

09/06/2010 04:24:57 PM (16 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (1 diff)
• bp-activity/bp-activity-notifications.php (modified) (1 diff)
• bp-activity/bp-activity-templatetags.php (modified) (1 diff)
• bp-blogs.php (modified) (15 diffs)
• bp-blogs/bp-blogs-classes.php (modified) (2 diffs)
• bp-blogs/bp-blogs-templatetags.php (modified) (2 diffs)
• bp-core.php (modified) (22 diffs)
• bp-core/admin/bp-core-upgrade.php (modified) (2 diffs)
• bp-core/bp-core-adminbar.php (modified) (1 diff)
• bp-core/bp-core-avatars.php (modified) (12 diffs)
• bp-core/bp-core-classes.php (modified) (4 diffs)
• bp-core/bp-core-cssjs.php (modified) (2 diffs)
• bp-core/bp-core-signup.php (modified) (9 diffs)
• bp-core/bp-core-templatetags.php (modified) (11 diffs)
• bp-core/bp-core-wpabstraction.php (modified) (1 diff)
• bp-forums.php (modified) (1 diff)
• bp-forums/bp-forums-templatetags.php (modified) (2 diffs)
• bp-friends.php (modified) (2 diffs)
• bp-groups.php (modified) (5 diffs)
• bp-groups/bp-groups-classes.php (modified) (13 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (1 diff)
• bp-loader.php (modified) (2 diffs)
• bp-messages/bp-messages-notifications.php (modified) (1 diff)
• bp-messages/bp-messages-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/_inc/css/default.css (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (12 diffs)
• bp-themes/bp-default/blogs/create.php (modified) (2 diffs)
• bp-themes/bp-default/comments.php (modified) (1 diff)
• bp-themes/bp-default/forums/forums-loop.php (modified) (3 diffs)
• bp-themes/bp-default/forums/index.php (modified) (2 diffs)
• bp-themes/bp-default/functions.php (modified) (1 diff)
• bp-themes/bp-default/groups/index.php (modified) (1 diff)
• bp-themes/bp-default/members/single/home.php (modified) (1 diff)
• bp-themes/bp-default/members/single/profile/edit.php (modified) (1 diff)
• bp-themes/bp-default/sidebar.php (modified) (1 diff)
• bp-xprofile.php (modified) (7 diffs)
• bp-xprofile/admin/css/admin.css (modified) (2 diffs)
• bp-xprofile/bp-xprofile-admin.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

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

@@ -35 +35 @@
                         $this->component = $row->component;
                         $this->type = $row->type;
-                        $this->action = $row->action;
+                        $this->action = $row->type;
                         $this->content = $row->content;
                         $this->date_recorded = $row->date_recorded;

trunk/bp-activity/bp-activity-notifications.php

@@ -13 +13 @@
 
         foreach( (array)$usernames as $username ) {
-                if ( !$receiver_user_id = bp_core_get_userid( $username ) )
+                if ( !$receiver_user_id = bp_core_get_userid($username) )
                         continue;
 

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

@@ -275 +275 @@
                 $total = bp_core_number_format( $activities_template->total_activity_count );
 
-                return sprintf( __( 'Viewing item %1$s to %2$s (of %3$s items)', 'buddypress' ), $from_num, $to_num, $total ) . ' &nbsp; <span class="ajax-loader"></span>';
+                return sprintf( __( 'Viewing item %s to %s (of %s items)', 'buddypress' ), $from_num, $to_num, $total ) . ' &nbsp; <span class="ajax-loader"></span>';
         }
 

trunk/bp-blogs.php

@@ -10 +10 @@
         global $bp, $wpdb;
 
-        if ( !defined( 'BP_BLOGS_SLUG' ) )
-                define ( 'BP_BLOGS_SLUG', $bp->pages->blogs->slug );
-
         /* For internal identification */
         $bp->blogs->id = 'blogs';
-        $bp->blogs->name = $bp->pages->blogs->name;
+
         $bp->blogs->slug = BP_BLOGS_SLUG;
 
-        $bp->blogs->table_name = $wpdb->base_prefix . 'bp_user_blogs';
-        $bp->blogs->table_name_blogmeta = $wpdb->base_prefix . 'bp_user_blogs_blogmeta';
+        $bp->blogs->table_name          = $bp->table_prefix . 'bp_user_blogs';
+        $bp->blogs->table_name_blogmeta = $bp->table_prefix . 'bp_user_blogs_blogmeta';
+
         $bp->blogs->format_notification_function = 'bp_blogs_format_notifications';
 
@@ -97 +95 @@
         do_action( 'bp_blogs_screen_my_blogs' );
         bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'members/single/home' ) );
+}
+
+function bp_blogs_screen_recent_posts() {
+        do_action( 'bp_blogs_screen_recent_posts' );
+        bp_core_load_template( apply_filters( 'bp_blogs_template_recent_posts', 'members/single/home' ) );
+}
+
+function bp_blogs_screen_recent_comments() {
+        do_action( 'bp_blogs_screen_recent_comments' );
+        bp_core_load_template( apply_filters( 'bp_blogs_template_recent_comments', 'members/single/home' ) );
 }
 
@@ -237 +245 @@
 }
 
+
 function bp_blogs_record_existing_blogs() {
         global $bp, $wpdb;
@@ -308 +317 @@
                 $user_id = (int)$post->post_author;
 
-        /* This is to stop infinite loops with Donncha's sitewide tags plugin */
+        /* This is to stop infinate loops with Donncha's sitewide tags plugin */
         if ( (int)$bp->site_options['tags_blog_id'] == (int)$blog_id )
                 return false;
@@ -316 +325 @@
                 return false;
 
-        if ( 'publish' == $post->post_status && '' == $post->post_password ) {
+        if ( !$is_recorded = BP_Blogs_Post::is_recorded( $post_id, $blog_id, $user_id ) ) {
+                if ( 'publish' == $post->post_status && '' == $post->post_password ) {
+
+                        /* If we're on a multiblog install, record this post */
+                        if ( bp_core_is_multisite() ) {
+                                $recorded_post = new BP_Blogs_Post;
+                                $recorded_post->user_id = $user_id;
+                                $recorded_post->blog_id = $blog_id;
+                                $recorded_post->post_id = $post_id;
+                                $recorded_post->date_created = strtotime( $post->post_date );
+
+                                $recorded_post_id = $recorded_post->save();
+
+                                bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+                        }
+
+                        if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
+                                /* Record this in activity streams */
+                                $post_permalink = get_permalink( $post_id );
+
+                                $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+                                $activity_content = $post->post_content;
+
+                                bp_blogs_record_activity( array(
+                                        'user_id' => (int)$post->post_author,
+                                        'action' => apply_filters( 'bp_blogs_activity_new_post_action', $activity_action, &$post, $post_permalink ),
+                                        'content' => apply_filters( 'bp_blogs_activity_new_post_content', $activity_content, &$post, $post_permalink ),
+                                        'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
+                                        'type' => 'new_blog_post',
+                                        'item_id' => $blog_id,
+                                        'secondary_item_id' => $post_id,
+                                        'recorded_time' => $post->post_date_gmt
+                                ));
+                        }
+                }
+        } else {
+                $existing_post = new BP_Blogs_Post( null, $blog_id, $post_id );
+
+                /* Delete the recorded post if the status is not published or it is password protected */
+                if ( 'publish' != $post->post_status || '' != $post->post_password ) {
+                        return bp_blogs_remove_post( $post_id, $blog_id, $existing_post );
+
+                /* If the post author has changed, delete the post and re-add it. */
+                } else if ( (int)$existing_post->user_id != (int)$post->post_author ) {
+                        // Delete the existing recorded post
+                        bp_blogs_remove_post( $post_id, $blog_id, $existing_post );
+
+                        // Re-record the post with the new author.
+                        bp_blogs_record_post( $post_id );
+                }
+
                 bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
 
                 if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
-                        /* Record this in activity streams */
+                        /* Now re-record the post in the activity streams */
                         $post_permalink = get_permalink( $post_id );
 
@@ -335 +394 @@
                                 'secondary_item_id' => $post_id,
                                 'recorded_time' => $post->post_date_gmt
-                        ));
+                        ) );
                 }
-        } else
-                bp_blogs_remove_post( $post_id, $blog_id );
+        }
 
         bp_blogs_update_blogmeta( $blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
 
-        do_action( 'bp_blogs_new_blog_post', $post_id, $post, $user_id );
+        do_action( 'bp_blogs_new_blog_post', $existing_post, $is_private, $is_recorded );
 }
 add_action( 'save_post', 'bp_blogs_record_post', 10, 2 );
@@ -349 +407 @@
         global $wpdb, $bp;
 
-        $comment = get_comment($comment_id);
-
-        if ( !$is_approved )
-                return false;
-
-        $comment->post = get_post( $comment->comment_post_ID );
-
-        /* Get the user_id from the author email. */
-        $user = get_user_by_email( $comment->comment_author_email );
+        // Get the users comment
+        $recorded_comment = get_comment( $comment_id );
+
+        // Don't record activity if the comment hasn't been approved
+        if ( !$is_approved || !$recorded_comment->comment_approved )
+                return false;
+
+        // Don't record activity if no email address has been included
+        if ( empty( $recorded_comment->comment_author_email ) )
+                return false;
+
+        // Get the user_id from the comment author email.
+        $user = get_user_by_email( $recorded_comment->comment_author_email );
         $user_id = (int)$user->ID;
 
-        if ( !$user_id )
-                return false;
-
-        /* If this is a password protected post, don't record the comment */
-        if ( !empty( $post->post_password ) )
-                return false;
-
-        if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
-                /* Record in activity streams */
-                $comment_link = get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment_id;
-                $activity_action = sprintf( __( '%1$s commented on the blog post %2$s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
-                $activity_content = $comment->comment_content;
-
-                /* Record this in activity streams */
+        // If there's no registered user id, don't record activity
+        if ( empty( $user_id ) )
+                return false;
+
+        // Get blog and post data
+        $blog_id = (int)$wpdb->blogid;
+        $recorded_comment->post = get_post( $recorded_comment->comment_post_ID );
+
+        // If this is a password protected post, don't record the comment
+        if ( !empty( $recorded_comment->post->post_password ) )
+                return false;
+
+        // If blog is public allow activity to be posted
+        if ( get_blog_option( $blog_id, 'blog_public' ) ) {
+                // Get activity related links
+                $post_permalink = get_permalink( $recorded_comment->comment_post_ID );
+                $comment_link   = htmlspecialchars( get_comment_link( $recorded_comment->comment_ID ) );
+
+                // Prepare to record in activity streams
+                $activity_action        = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>' );
+                $activity_content       = $recorded_comment->comment_content;
+
+                // Record in activity streams
                 bp_blogs_record_activity( array(
-                        'user_id' => $user_id,
-                        'action' => apply_filters( 'bp_blogs_activity_new_comment_action', $activity_action, &$comment, &$recorded_comment, $comment_link ),
-                        'content' => apply_filters( 'bp_blogs_activity_new_comment_content', $activity_content, &$comment, &$recorded_comment, $comment_link ),
-                        'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
-                        'type' => 'new_blog_comment',
-                        'item_id' => $wpdb->blogid,
+                        'user_id'           => $user_id,
+                        'action'            => apply_filters( 'bp_blogs_activity_new_comment_action', $activity_action, &$recorded_comment, $comment_link ),
+                        'content'           => apply_filters( 'bp_blogs_activity_new_comment_content', $activity_content, &$recorded_comment, $comment_link ),
+                        'primary_link'      => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$recorded_comment ),
+                        'type'              => 'new_blog_comment',
+                        'item_id'           => $blog_id,
                         'secondary_item_id' => $comment_id,
-                        'recorded_time' => $comment->comment_date_gmt
+                        'recorded_time'     => $recorded_comment->comment_date_gmt
                 ) );
-        }
-
-        bp_blogs_update_blogmeta( $blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+
+                // Update the blogs last active date
+                bp_blogs_update_blogmeta( $blog_id, 'last_activity', bp_core_current_time() );
+        }
 
         return $recorded_comment;
@@ -451 +523 @@
 add_action( 'remove_user_from_blog', 'bp_blogs_remove_blog_for_user', 10, 2 );
 
-function bp_blogs_remove_post( $post_id, $blog_id = false ) {
+function bp_blogs_remove_post( $post_id, $blog_id = false, $existing_post = false ) {
         global $current_blog, $bp;
 
@@ -459 +531 @@
                 $blog_id = (int)$current_blog->blog_id;
 
+        if ( !$existing_post )
+                $existing_post = new BP_Blogs_Post( null, $blog_id, $post_id );
+
+        // Delete post from the bp_blogs table
+        BP_Blogs_Post::delete( $post_id, $blog_id );
+
         // Delete activity stream item
         bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'secondary_item_id' => $post_id, 'component' => $bp->blogs->slug, 'type' => 'new_blog_post' ) );
@@ -468 +546 @@
 function bp_blogs_remove_comment( $comment_id ) {
         global $wpdb, $bp;
+
+        $recorded_comment = new BP_Blogs_Comment( false, $wpdb->blogid, $comment_id );
+        BP_Blogs_Comment::delete( $comment_id, $wpdb->blogid );
 
         // Delete activity stream item
@@ -504 +585 @@
         /* If this is regular blog, delete all data for that blog. */
         BP_Blogs_Blog::delete_blog_for_all( $blog_id );
+        BP_Blogs_Post::delete_posts_for_blog( $blog_id );
+        BP_Blogs_Comment::delete_comments_for_blog( $blog_id );
 
         // Delete activity stream item
@@ -516 +599 @@
 }
 
+/* DEPRECATED - scheduled for removal. Please use the activity stream with a 'new_blog_post' filter. */
+function bp_blogs_get_posts_for_user( $user_id ) {
+        return BP_Blogs_Post::get_posts_for_user( $user_id );
+}
+
+/* DEPRECATED - scheduled for removal. Please use the activity stream with a 'new_blog_comment' filter. */
+function bp_blogs_get_comments_for_user( $user_id ) {
+        return BP_Blogs_Comment::get_comments_for_user( $user_id );
+}
+
+function bp_blogs_get_latest_posts( $blog_id = null, $limit = 5 ) {
+        global $bp;
+
+        if ( !is_numeric( $limit ) )
+                $limit = 5;
+
+        return BP_Blogs_Post::get_latest_posts( $blog_id, $limit );
+}
+
 function bp_blogs_get_all_blogs( $limit = null, $page = null ) {
         return BP_Blogs_Blog::get_all( $limit, $page );
@@ -522 +624 @@
 function bp_blogs_get_random_blogs( $limit = null, $page = null ) {
         return BP_Blogs_Blog::get( 'random', $limit, $page );
+}
+
+function bp_blogs_get_all_posts( $limit = null, $page = null ) {
+        return BP_Blogs_Post::get_all( $limit, $page );
+}
+
+function bp_blogs_total_post_count( $blog_id ) {
+        return BP_Blogs_Post::total_post_count( $blog_id );
+}
+
+function bp_blogs_total_comment_count( $blog_id, $post_id = false ) {
+        return BP_Blogs_Post::total_comment_count( $blog_id, $post_id );
 }
 
@@ -640 +754 @@
 
 function bp_blogs_remove_data( $user_id ) {
-        if ( !bp_core_is_multisite() )
-                return false;
-
         /* If this is regular blog, delete all data for that blog. */
         BP_Blogs_Blog::delete_blogs_for_user( $user_id );
+        BP_Blogs_Post::delete_posts_for_user( $user_id );
+        BP_Blogs_Comment::delete_comments_for_user( $user_id );
 
         do_action( 'bp_blogs_remove_data', $user_id );
 }
-add_action( 'wpmu_delete_user', 'bp_blogs_remove_data' );
-add_action( 'delete_user', 'bp_blogs_remove_data' );
-add_action( 'make_spam_user', 'bp_blogs_remove_data' );
+add_action( 'wpmu_delete_user', 'bp_blogs_remove_data', 1 );
+add_action( 'delete_user', 'bp_blogs_remove_data', 1 );
 
 
@@ -677 +789 @@
 }
 
+function bp_blogs_clear_post_object_cache( $blog_id, $post_id, $user_id ) {
+        wp_cache_delete( 'bp_user_posts_' . $user_id, 'bp' );
+}
+
+function bp_blogs_format_clear_post_cache( $recorded_post_obj ) {
+        bp_blogs_clear_post_object_cache( false, false, $recorded_post_obj->user_id );
+
+        /* Clear the sitewide activity cache */
+        wp_cache_delete( 'sitewide_activity', 'bp' );
+}
+
+function bp_blogs_clear_comment_object_cache( $blog_id, $comment_id, $user_id ) {
+        wp_cache_delete( 'bp_user_comments_' . $user_id, 'bp' );
+}
+
+function bp_blogs_format_clear_comment_cache( $recorded_comment_obj ) {
+        bp_blogs_clear_comment_object_cache( false, false, $recorded_comment_obj->user_id );
+
+        /* Clear the sitewide activity cache */
+        wp_cache_delete( 'sitewide_activity', 'bp' );
+}
+
 // List actions to clear object caches on
 add_action( 'bp_blogs_remove_blog_for_user', 'bp_blogs_clear_blog_object_cache', 10, 2 );
+add_action( 'bp_blogs_remove_post', 'bp_blogs_clear_post_object_cache', 10, 3 );
+add_action( 'bp_blogs_remove_comment', 'bp_blogs_clear_comment_object_cache', 10, 3 );
+
 add_action( 'bp_blogs_new_blog', 'bp_blogs_format_clear_blog_cache', 10, 2 );
+add_action( 'bp_blogs_new_blog_post', 'bp_blogs_format_clear_post_cache', 10, 2 );
+add_action( 'bp_blogs_new_blog_comment', 'bp_blogs_format_clear_comment_cache', 10, 2 );
 
 // List actions to clear super cached pages on, if super cache is installed

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

@@ -279 +279 @@
                         return $paged_blogs;
 
-                for ( $i = 0; $i < count( $paged_blogs ); $i++ )
-                        $paged_blogs[$i]->latest_post = $wpdb->get_row( "SELECT post_title, guid FROM {$wpdb->base_prefix}" . $paged_blogs[$i]->blog_id . "_posts WHERE post_status = 'publish' AND post_type = 'post' AND id != 1 ORDER BY id DESC LIMIT 1" );
+                /* Fetch lastest post for each blog. */
+                $post_ids = $wpdb->get_results( $wpdb->prepare( "SELECT p.post_id, p.blog_id FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.blog_id IN ( {$blog_ids} ) GROUP BY p.blog_id ORDER BY p.date_created DESC" ) );
+
+                for ( $i = 0; $i < count( $paged_blogs ); $i++ ) {
+                        foreach ( (array)$post_ids as $post ) {
+                                if ( $post->blog_id == $paged_blogs[$i]->blog_id ) {
+                                        $paged_blogs[$i]->latest_post = $wpdb->get_row( "SELECT post_title, guid FROM {$wpdb->base_prefix}" . $post->blog_id . "_posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY id DESC LIMIT 1" );
+                                }
+                        }
+                }
 
                 /* Fetch the blog description for each blog (as it may be empty we can't fetch it in the main query). */
@@ -308 +316 @@
 }
 
+/* DEPRECATED - Post DB recording is scheduled for removal. Please use the activity stream to fetch a user's posts. */
+Class BP_Blogs_Post {
+        var $id;
+        var $user_id;
+        var $blog_id;
+        var $post_id;
+        var $date_created;
+
+        function bp_blogs_post( $id = null, $blog_id = null, $post_id = null ) {
+                global $bp, $wpdb;
+
+                if ( $id || ( !$id && $blog_id && $post_id ) ) {
+                        $this->id = $id;
+                        $this->blog_id = $blog_id;
+                        $this->post_id = $post_id;
+                        $this->populate();
+                }
+        }
+
+        function populate() {
+                global $wpdb, $bp;
+
+                if ( $this->id )
+                        $post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blog_posts} WHERE id = %d", $this->id ) );
+                else
+                        $post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d AND post_id = %d", $this->blog_id, $this->post_id ) );
+
+                $this->id = $post->id;
+                $this->user_id = $post->user_id;
+                $this->blog_id = $post->blog_id;
+                $this->post_id = $post->post_id;
+                $this->date_created = $post->date_created;
+        }
+
+        function save() {
+                global $wpdb, $bp;
+
+                $this->post_id = apply_filters( 'bp_blogs_post_id_before_save', $this->post_id, $this->id );
+                $this->blog_id = apply_filters( 'bp_blogs_post_blog_id_before_save', $this->blog_id, $this->id );
+                $this->user_id = apply_filters( 'bp_blogs_post_user_id_before_save', $this->user_id, $this->id );
+                $this->date_created = apply_filters( 'bp_blogs_post_date_created_before_save', $this->date_created, $this->id );
+
+                do_action( 'bp_blogs_post_before_save', $this );
+
+                if ( $this->id ) {
+                        // Update
+                        $sql = $wpdb->prepare( "UPDATE {$bp->blogs->table_name_blog_posts} SET post_id = %d, blog_id = %d, user_id = %d, date_created = FROM_UNIXTIME(%d) WHERE id = %d", $this->post_id, $this->blog_id, $this->user_id, $this->date_created, $this->id );
+                } else {
+                        // Save
+                        $sql = $wpdb->prepare( "INSERT INTO {$bp->blogs->table_name_blog_posts} ( post_id, blog_id, user_id, date_created ) VALUES ( %d, %d, %d, FROM_UNIXTIME(%d) )", $this->post_id, $this->blog_id, $this->user_id, $this->date_created );
+                }
+
+                if ( !$wpdb->query($sql) )
+                        return false;
+
+                do_action( 'bp_blogs_post_after_save', $this );
+
+                if ( $this->id )
+                        return $this->id;
+                else
+                        return $wpdb->insert_id;
+        }
+
+        /* Static Functions */
+
+        function delete( $post_id, $blog_id ) {
+                global $wpdb, $bp, $current_user;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d AND post_id = %d", $blog_id, $post_id ) );
+        }
+
+        function delete_oldest( $user_id = null ) {
+                global $wpdb, $bp;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( !$user_id )
+                        $user_id = $current_user->ID;
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE user_id = %d ORDER BY date_created ASC LIMIT 1", $user_id ) );
+        }
+
+        function delete_posts_for_user( $user_id = null ) {
+                global $wpdb, $bp;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( !$user_id )
+                        $user_id = $bp->loggedin_user->id;
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE user_id = %d", $user_id ) );
+        }
+
+        function delete_posts_for_blog( $blog_id ) {
+                global $wpdb, $bp;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d", $blog_id ) );
+        }
+
+        function get_latest_posts( $blog_id = null, $limit = 5 ) {
+                global $wpdb, $bp;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( $blog_id )
+                        $blog_sql = $wpdb->prepare( " AND p.blog_id = %d", $blog_id );
+
+                $post_ids = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT p.post_id, p.blog_id FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 $blog_sql ORDER BY p.date_created DESC LIMIT $limit" ) );
+
+                for ( $i = 0; $i < count($post_ids); $i++ ) {
+                        $posts[$i] = BP_Blogs_Post::fetch_post_content($post_ids[$i]);
+                }
+
+                return $posts;
+        }
+
+        function get_posts_for_user( $user_id = null ) {
+                global $bp, $wpdb;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( !$user_id )
+                        $user_id = $bp->displayed_user->id;
+
+                // Show a logged in user their posts on private blogs, but not anyone else.
+                if ( !bp_is_my_profile() ) {
+                        $post_ids = $wpdb->get_results( $wpdb->prepare( "SELECT p.post_id, p.blog_id FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.user_id = %d ORDER BY p.date_created DESC", $user_id) );
+                        $total_post_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(p.post_id) FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.user_id = %d", $user_id) );
+                } else {
+                        $post_ids = $wpdb->get_results( $wpdb->prepare( "SELECT p.post_id, p.blog_id FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.user_id = %d ORDER BY p.date_created DESC", $user_id) );
+
+                        $total_post_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(p.post_id) FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.user_id = %d", $user_id) );
+                }
+
+                for ( $i = 0; $i < count($post_ids); $i++ ) {
+                        $posts[$i] = BP_Blogs_Post::fetch_post_content($post_ids[$i]);
+                }
+
+                return array( 'posts' => $posts, 'count' => $total_post_count );
+        }
+
+        function fetch_post_content( $post_object ) {
+                // TODO: switch_to_blog() calls are expensive and this needs to be changed.
+                switch_to_blog( $post_object->blog_id );
+                $post = get_post($post_object->post_id);
+                $post->blog_id = $post_object->blog_id;
+                restore_current_blog();
+
+                return $post;
+        }
+
+        function get_total_recorded_for_user( $user_id = null ) {
+                global $bp, $wpdb;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( !$user_id )
+                        $user_id = $current_user->ID;
+
+                return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(post_id) FROM {$bp->blogs->table_name_blog_posts} WHERE user_id = %d", $user_id ) );
+        }
+
+        function is_recorded( $post_id, $blog_id, $user_id = null ) {
+                global $bp, $wpdb, $current_user;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( !$user_id )
+                        $user_id = $current_user->ID;
+
+                return $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM {$bp->blogs->table_name_blog_posts} WHERE post_id = %d AND blog_id = %d AND user_id = %d", $post_id, $blog_id, $user_id ) );
+        }
+
+        function total_post_count( $blog_id ) {
+                global $bp, $wpdb;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( !$blog_id )
+                        return false;
+
+                return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(post_id) FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d", $blog_id ) );
+        }
+
+        function get_all() {
+                global $bp, $wpdb;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                return $wpdb->get_col( $wpdb->prepare( "SELECT post_id, blog_id FROM " . $bp->blogs->table_name_blog_posts ) );
+        }
+
+}
+
+/* DEPRECATED - Comment DB recording is scheduled for removal. Please use the activity stream to fetch a user's comments. */
+Class BP_Blogs_Comment {
+        var $id;
+        var $user_id;
+        var $blog_id;
+        var $comment_id;
+        var $comment_post_id;
+        var $date_created;
+
+        function bp_blogs_comment( $id = false, $blog_id = false, $comment_id = false ) {
+                global $bp, $wpdb;
+
+                if ( !$user_id )
+                        $user_id = $bp->displayed_user->id;
+
+                if ( $id || ( !$id && $blog_id && $comment_id ) ) {
+                        $this->id = $id;
+                        $this->blog_id = $blog_id;
+                        $this->comment_id = $comment_id;
+                        $this->populate();
+                }
+        }
+
+        function populate() {
+                global $wpdb, $bp;
+
+                if ( $this->id )
+                        $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blog_comments} WHERE id = %d", $this->id ) );
+                else
+                        $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blog_comments} WHERE blog_id = %d AND comment_id = %d", (int)$this->blog_id, (int)$this->comment_id ) );
+
+                $this->comment_id = $comment->comment_id;
+                $this->user_id = $comment->user_id;
+                $this->blog_id = $comment->blog_id;
+                $this->comment_post_id = $comment->comment_post_id;
+                $this->date_created = $comment->date_created;
+        }
+
+        function save() {
+                global $wpdb, $bp;
+
+                $this->comment_id = apply_filters( 'bp_blogs_comment_id_before_save', $this->comment_id, $this->id );
+                $this->comment_post_id = apply_filters( 'bp_blogs_comment_post_id_before_save', $this->comment_post_id, $this->id );
+                $this->blog_id = apply_filters( 'bp_blogs_comment_blog_id_before_save', $this->blog_id, $this->id );
+                $this->user_id = apply_filters( 'bp_blogs_comment_user_id_before_save', $this->user_id, $this->id );
+                $this->date_created = apply_filters( 'bp_blogs_comment_date_created_before_save', $this->date_created, $this->id );
+
+                do_action( 'bp_blogs_comment_before_save', $this );
+
+                if ( $this->id ) {
+                        // Update
+                        $sql = $wpdb->prepare( "UPDATE {$bp->blogs->table_name_blog_comments} SET comment_id = %d, comment_post_id = %d, blog_id = %d, user_id = %d, date_created = FROM_UNIXTIME(%d) WHERE id = %d", $this->comment_id, $this->comment_post_id, $this->blog_id, $this->user_id, $this->date_created, $this->id );
+                } else {
+                        // Save
+                        $sql = $wpdb->prepare( "INSERT INTO {$bp->blogs->table_name_blog_comments} ( comment_id, comment_post_id, blog_id, user_id, date_created ) VALUES ( %d, %d, %d, %d, FROM_UNIXTIME(%d) )", $this->comment_id, $this->comment_post_id, $this->blog_id, $this->user_id, $this->date_created );
+                }
+
+                if ( !$wpdb->query($sql) )
+                        return false;
+
+                do_action( 'bp_blogs_comment_after_save', $this );
+
+                if ( $this->id )
+                        return $this->id;
+                else
+                        return $wpdb->insert_id;
+        }
+
+        /* Static Functions */
+
+        function delete( $comment_id, $blog_id ) {
+                global $wpdb, $bp, $current_user;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE comment_id = %d AND blog_id = %d", $comment_id, $blog_id ) );
+        }
+
+        function delete_oldest( $user_id = null ) {
+                global $wpdb, $bp, $current_user;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( !$user_id )
+                        $user_id = $current_user->ID;
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE user_id = %d ORDER BY date_created ASC LIMIT 1", $user_id ) );
+        }
+
+        function delete_comments_for_user( $user_id = null ) {
+                global $wpdb, $bp;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( !$user_id )
+                        $user_id = $bp->loggedin_user->id;
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE user_id = %d", $user_id ) );
+        }
+
+        function delete_comments_for_blog( $blog_id ) {
+                global $wpdb, $bp;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE blog_id = %d", $blog_id ) );
+        }
+
+        function get_comments_for_user( $user_id = null ) {
+                global $bp, $wpdb;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( !$user_id )
+                        $user_id = $bp->displayed_user->id;
+
+                // Show the logged in user their comments on hidden blogs, but not to anyone else.
+                if ( !bp_is_my_profile() ) {
+                        $comment_ids = $wpdb->get_results( $wpdb->prepare( "SELECT c.comment_id, c.blog_id FROM {$bp->blogs->table_name_blog_comments} c LEFT JOIN {$wpdb->base_prefix}blogs b ON c.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND c.user_id = %d ORDER BY c.date_created ASC", $user_id) );
+                        $total_comment_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(c.comment_id) FROM {$bp->blogs->table_name_blog_comments} c LEFT JOIN {$wpdb->base_prefix}blogs b ON c.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND c.user_id = %d", $user_id) );
+                } else {
+                        $comment_ids = $wpdb->get_results( $wpdb->prepare( "SELECT c.comment_id, c.blog_id FROM {$bp->blogs->table_name_blog_comments} c LEFT JOIN {$wpdb->base_prefix}blogs b ON c.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND c.user_id = %d ORDER BY c.date_created ASC", $user_id) );
+
+                        $total_comment_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(c.comment_id) FROM {$bp->blogs->table_name_blog_comments} c LEFT JOIN {$wpdb->base_prefix}blogs b ON c.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND c.user_id = %d", $user_id) );
+                }
+
+                for ( $i = 0; $i < count($comment_ids); $i++ )
+                        $comments[$i] = BP_Blogs_Comment::fetch_comment_content($comment_ids[$i]);
+
+                return array( 'comments' => $comments, 'count' => $total_comment_count );
+        }
+
+        function fetch_comment_content( $comment_object ) {
+                switch_to_blog($comment_object->blog_id);
+                $comment = get_comment($comment_object->comment_id);
+                $comment->blog_id = $comment_object->blog_id;
+                $comment->post = &get_post( $comment->comment_post_ID );
+                restore_current_blog();
+
+                return $comment;
+        }
+
+        function get_total_recorded_for_user( $user_id = null ) {
+                global $bp, $wpdb, $current_user;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( !$user_id )
+                        $user_id = $current_user->ID;
+
+                return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_id) FROM {$bp->blogs->table_name_blog_comments} WHERE user_id = %d", $user_id ) );
+        }
+
+        function total_comment_count( $blog_id, $post_id ) {
+                global $bp, $wpdb;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( $post_id )
+                        $post_sql = $wpdb->prepare( " AND comment_post_id = %d", $post_id );
+
+                return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_id) WHERE blog_id = %d{$post_sql}", $blog_id ) );
+        }
+
+
+        function is_recorded( $comment_id, $comment_post_id, $blog_id, $user_id = null ) {
+                global $bp, $wpdb, $current_user;
+
+                if ( !$bp->blogs )
+                        bp_blogs_setup_globals();
+
+                if ( !$user_id )
+                        $user_id = $current_user->ID;
+
+                return $wpdb->get_var( $wpdb->prepare( "SELECT comment_id FROM {$bp->blogs->table_name_blog_comments} WHERE comment_id = %d AND blog_id = %d AND comment_post_id = %d AND user_id = %d", $comment_id, $blog_id, $comment_post_id, $user_id ) );
+        }
+
+}
+
 ?>

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

@@ -145 +145 @@
 
         $blogs_template = new BP_Blogs_Template( $type, $page, $per_page, $max, $user_id, $search_terms );
-        return apply_filters( 'bp_has_blogs', $blogs_template->has_blogs(), &$blogs_template );
+        return $blogs_template->has_blogs();
 }
 
@@ -167 +167 @@
         $total = bp_core_number_format( $blogs_template->total_blog_count );
 
-        echo sprintf( __( 'Viewing blog %1$s to %2$s (of %3$s blogs)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
+        echo sprintf( __( 'Viewing blog %s to %s (of %s blogs)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
         <span class="ajax-loader"></span><?php
 }

trunk/bp-core.php

@@ -30 +30 @@
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-catchuri.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-classes.php' );
-require ( BP_PLUGIN_DIR . '/bp-core/bp-core-filters.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-cssjs.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-avatars.php' );
@@ -38 +37 @@
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-notifications.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-signup.php' );
+
+/* Multisite includes built in account activation support. */
+if ( bp_core_is_multisite() )
+        require ( BP_PLUGIN_DIR . '/bp-core/bp-core-activation.php' );
 
 /* If BP_DISABLE_ADMIN_BAR is defined, do not load the global admin bar. */
@@ -229 +232 @@
         }
 
-
         return apply_filters( 'bp_core_get_page_names', $pages );
 }
+
 
 /**
@@ -463 +466 @@
                 }
 
-                do_action( 'bp_core_action_delete_user', $errors );
+                do_action( 'bp_core_action_set_spammer_status', $errors );
 
                 if ( $errors )
@@ -497 +500 @@
                 'search_terms' => false, // Limit to users that match these search terms
 
-                'include' => false, // Pass comma separated list of user_ids to limit to only these users
                 'per_page' => 20, // The number of results to return per page
                 'page' => 1, // The page to return if limiting per page
@@ -506 +508 @@
         extract( $params, EXTR_SKIP );
 
-        return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $include, $search_terms, $populate_extras ), &$params );
+        return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $search_terms, $populate_extras ), &$params );
 }
 
@@ -898 +900 @@
 }
 
-
 /**
  * bp_core_get_random_member()
@@ -934 +935 @@
         global $wpdb;
 
-        if ( empty( $username ) )
-                return false;
-
-        return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
+        if ( !empty( $username ) )
+                return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
 }
 
@@ -1290 +1289 @@
 add_action( 'bp_init', 'bp_core_setup_message' );
 
+
 /**
  * bp_core_render_message()
@@ -1331 +1331 @@
 function bp_core_time_since( $older_date, $newer_date = false ) {
         // array of time period chunks
-
         $chunks = array(
         array( 60 * 60 * 24 * 365 , __( 'year', 'buddypress' ), __( 'years', 'buddypress' ) ),
@@ -1451 +1450 @@
                 return $number;
 
-        return apply_filters( 'bp_core_number_format', number_format( $number, $decimals ), $number, $decimals );
+        return apply_filters( 'bp_core_bp_core_number_format', number_format( $number, $decimals ), $number, $decimals );
 }
 
@@ -1498 +1497 @@
                         unset( $site_path[2] );
 
-                        if ( !count( $site_path ) )
-                                $site_path = '/';
-                        else
-                                $site_path = '/' . implode( '/', $site_path ) . '/';
+                        $site_path = '/' . implode( '/', $site_path ) . '/';
                 }
         }
@@ -1507 +1503 @@
         return apply_filters( 'bp_core_get_site_path', $site_path );
 }
+
 /**
  * bp_core_get_site_options()
@@ -1623 +1620 @@
 
 /**
+ * bp_core_email_from_name_filter()
+ *
+ * Sets the "From" name in emails sent to the name of the site and not "WordPress"
+ *
+ * @package BuddyPress Core
+ * @uses get_blog_option() fetches the value for a meta_key in the wp_X_options table
+ * @return The blog name for the root blog
+ */
+function bp_core_email_from_name_filter() {
+        return apply_filters( 'bp_core_email_from_name_filter', get_blog_option( BP_ROOT_BLOG, 'blogname' ) );
+}
+add_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
+
+
+/**
+ * bp_core_email_from_name_filter()
+ *
+ * Sets the "From" address in emails sent
+ *
+ * @package BuddyPress Core
+ * @global $current_site Object containing current site metadata
+ * @return noreply@sitedomain email address
+ */
+function bp_core_email_from_address_filter() {
+        $domain = (array) explode( '/', site_url() );
+
+        return apply_filters( 'bp_core_email_from_address_filter', __( 'noreply', 'buddypress' ) . '@' . $domain[2] );
+}
+add_filter( 'wp_mail_from', 'bp_core_email_from_address_filter' );
+
+/**
  * bp_core_delete_account()
  *
@@ -1635 +1663 @@
  */
 function bp_core_delete_account( $user_id = false ) {
-        global $bp, $wpdb;
+        global $bp, $wp_version;
 
         if ( !$user_id )
@@ -1644 +1672 @@
                 return false;
 
+        /* Site admins cannot be deleted */
+        if ( is_super_admin( bp_core_get_username( $user_id ) ) )
+                return false;
+
         /* Specifically handle multi-site environment */
         if ( bp_core_is_multisite() ) {
-                /* Site admins cannot be deleted */
-                if ( is_site_admin( bp_core_get_username( $user_id ) ) )
-                        return false;
-
-                require_once( ABSPATH . '/wp-admin/includes/mu.php' );
+                if ( $wp_version >= '3.0' )
+                        require_once( ABSPATH . '/wp-admin/includes/ms.php' );
+                else
+                        require_once( ABSPATH . '/wp-admin/includes/mu.php' );
+
                 require_once( ABSPATH . '/wp-admin/includes/user.php' );
 
                 return wpmu_delete_user( $user_id );
-        }
 
         /* Single site user deletion */
-        require_once( ABSPATH . '/wp-admin/includes/user.php' );
-        return wp_delete_user( $user_id );
-}
-
+        } else {
+                require_once( ABSPATH . '/wp-admin/includes/user.php' );
+                return wp_delete_user( $user_id );
+        }
+}
 
 /**
@@ -1767 +1799 @@
         ?>
 
-<!-- Generated in <?php timer_stop(1); ?> seconds. -->
+<!-- Generated in <?php timer_stop(1); ?> seconds. (<?php echo get_num_queries(); ?> q) -->
 
         <?php
@@ -1838 +1870 @@
         $user = get_userdatabylogin( $username );
 
-        if ( ( bp_core_is_multisite() && (int)$user->spam ) || 1 == (int)$user->user_status )
+        if ( (int)$user->spam )
                 bp_core_redirect( $bp->root_domain );
         else
@@ -1861 +1893 @@
         wp_cache_flush();
 }
-add_action( 'wpmu_delete_user', 'bp_core_remove_data' );
-add_action( 'delete_user', 'bp_core_remove_data' );
-add_action( 'make_spam_user', 'bp_core_remove_data' );
+add_action( 'wpmu_delete_user', 'bp_core_remove_data', 1 );
+add_action( 'delete_user', 'bp_core_remove_data', 1 );
+add_action( 'make_spam_user', 'bp_core_remove_data', 1 );
 
 /**
@@ -1899 +1931 @@
 }
 add_action( 'in_plugin_update_message-buddypress/bp-loader.php', 'bp_core_update_message' );
+
+/**
+ * bp_core_filter_parent_theme()
+ *
+ * Remove social network parent theme from the theme list.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_filter_parent_theme() {
+        global $wp_themes, $pagenow;
+
+        if ( is_admin() && 'themes.php' == $pagenow )
+                $wp_themes = get_themes();
+
+        unset( $wp_themes['BuddyPress Classic Parent'] );
+}
+add_filter( 'admin_menu', 'bp_core_filter_parent_theme' );
+
+/**
+ * bp_core_allow_default_theme()
+ *
+ * On multiblog installations you must first allow themes to be activated and show
+ * up on the theme selection screen. This function will let the BuddyPress bundled
+ * themes show up on the root blog selection screen and bypass this step. It also
+ * means that the themes won't show for selection on other blogs.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_allow_default_theme( $themes ) {
+        global $bp, $current_blog;
+
+        if ( !is_site_admin() )
+                return $themes;
+
+        if ( $current_blog->ID == $bp->root_blog ) {
+                $themes['bp-default'] = 1;
+                $themes['bp-classic'] = 1;
+        }
+
+        return $themes;
+}
+add_filter( 'allowed_themes', 'bp_core_allow_default_theme' );
 
 /**
@@ -1941 +2015 @@
 add_action( 'admin_notices', 'bp_core_activation_notice' );
 
+
+/**
+ * bp_core_filter_comments()
+ *
+ * Filter the blog post comments array and insert BuddyPress URLs for users.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_filter_comments( $comments, $post_id ) {
+        global $wpdb;
+
+        foreach( (array)$comments as $comment ) {
+                if ( $comment->user_id )
+                        $user_ids[] = $comment->user_id;
+        }
+
+        if ( empty( $user_ids ) )
+                return $comments;
+
+        $user_ids = implode( ',', $user_ids );
+
+        if ( !$userdata = $wpdb->get_results( $wpdb->prepare( "SELECT ID as user_id, user_login, user_nicename FROM {$wpdb->users} WHERE ID IN ({$user_ids})" ) ) )
+                return $comments;
+
+        foreach( (array)$userdata as $user )
+                $users[$user->user_id] = bp_core_get_user_domain( $user->user_id, $user->user_nicename, $user->user_login );
+
+        foreach( (array)$comments as $i => $comment ) {
+                if ( !empty( $comment->user_id ) ) {
+                        if ( !empty( $users[$comment->user_id] ) )
+                                $comments[$i]->comment_author_url = $users[$comment->user_id];
+                }
+        }
+
+        return $comments;
+}
+add_filter( 'comments_array', 'bp_core_filter_comments', 10, 2 );
+
+
+/**
+ * bp_core_login_redirect()
+ *
+ * When a user logs in, always redirect them back to the previous page. NOT the admin area.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_login_redirect( $redirect_to ) {
+        global $bp, $current_blog;
+
+        if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
+                return $redirect_to;
+
+        if ( !empty( $_REQUEST['redirect_to'] ) || strpos( $_REQUEST['redirect_to'], 'wp-admin' ) )
+                return $redirect_to;
+
+        if ( false === strpos( wp_get_referer(), 'wp-login.php' ) && false === strpos( wp_get_referer(), 'activate' ) && empty( $_REQUEST['nr'] ) )
+                return wp_get_referer();
+
+        return $bp->root_domain;
+}
+add_filter( 'login_redirect', 'bp_core_login_redirect' );
+
+
 /********************************************************************************
  * Custom Actions
@@ -1964 +2101 @@
         do_action( 'bp_setup_nav' );
 }
-add_action( 'plugins_loaded', 'bp_setup_nav' );
-add_action( 'admin_menu', 'bp_setup_nav' );
+add_action( 'bp_loaded', 'bp_setup_nav', 8 );
 
 /* Allow core components and dependent plugins to register widgets */

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

@@ -236 +236 @@
                         </div>
 
+
+                        <?php if ( bp_core_is_multisite() ) : ?>
                         <div class="component">
                                 <h5><?php _e( "Blog Tracking", 'buddypress' ) ?></h5>
@@ -245 +247 @@
 
                                 <img src="<?php echo plugins_url( 'buddypress/screenshot-7.gif' ) ?>" alt="Activity Streams" />
-                                <p><?php _e( "Track new blogs, new posts and new comments across your entire blog network.", 'buddypress' ) ?></p>
+                                        <p><?php _e( "Track new blogs, new posts and new comments across your entire blog network.", 'buddypress' ) ?></p>
                         </div>
+                        <?php endif; ?>
                 </div>
 

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

@@ -7 +7 @@
                 return false;
 
-        if ( (int)get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() )
+        if ( (int)$bp->site_options['hide-loggedout-adminbar'] && !is_user_logged_in() )
                 return false;
 

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

@@ -40 +40 @@
 
         if ( !defined( 'BP_AVATAR_DEFAULT' ) )
-                define( 'BP_AVATAR_DEFAULT', BP_PLUGIN_URL . '/bp-xprofile/images/none.gif' );
+                define( 'BP_AVATAR_DEFAULT', BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg' );
 
         if ( !defined( 'BP_AVATAR_DEFAULT_THUMB' ) )
-                define( 'BP_AVATAR_DEFAULT_THUMB', BP_PLUGIN_URL . '/bp-xprofile/images/none-thumbnail.gif' );
-}
-add_action( 'bp_init', 'bp_core_set_avatar_constants' );
-
+                define( 'BP_AVATAR_DEFAULT_THUMB', BP_PLUGIN_URL . '/bp-core/images/mystery-man-50.jpg' );
+}
+add_action( 'bp_loaded', 'bp_core_set_avatar_constants', 8 );
+
+/**
+ * bp_core_fetch_avatar()
+ *
+ * Fetches an avatar from a BuddyPress object. Supports user/group/blog as
+ * default, but can be extended to include your own custom components too.
+ *
+ * @global object $bp
+ * @global object $current_blog
+ * @param array $args Determine the output of this function
+ * @return string Formatted HTML <img> element, or raw avatar URL based on $html arg
+ */
 function bp_core_fetch_avatar( $args = '' ) {
         global $bp, $current_blog;
 
+        // Set a few default variables
+        $def_object             = 'user';
+        $def_type               = 'thumb';
+        $def_class              = 'avatar';
+        $def_alt                = __( 'Avatar Image', 'buddypress' );
+
+        // Set the default variables array
         $defaults = array(
-                'item_id' => false,
-                'object' => 'user', // user OR group OR blog OR custom type (if you use filters)
-                'type' => 'thumb',
-                'avatar_dir' => false,
-                'width' => false,
-                'height' => false,
-                'class' => 'avatar',
-                'css_id' => false,
-                'alt' => __( 'Avatar Image', 'buddypress' ),
-                'email' => false, // Pass the user email (for gravatar) to prevent querying the DB for it
-                'no_grav' => false // If there is no avatar found, return false instead of a grav?
+                'item_id'               => false,
+                'object'                => $def_object, // user/group/blog/custom type (if you use filters)
+                'type'                  => $def_type,   // thumb or full
+                'avatar_dir'    => false,               // Specify a custom avatar directory for your object
+                'width'                 => false,               // Custom width (int)
+                'height'                => false,               // Custom height (int)
+                'class'                 => $def_class,  // Custom <img> class (string)
+                'css_id'                => false,               // Custom <img> ID (string)
+                'alt'                   => $def_alt,    // Custom <img> alt (string)
+                'email'                 => false,               // Pass the user email (for gravatar) to prevent querying the DB for it
+                'no_grav'               => false,               // If there is no avatar found, return false instead of a grav?
+                'html'                  => true                 // Wrap the return img URL in <img />
         );
 
+        // Compare defaults to passed and extract
         $params = wp_parse_args( $args, $defaults );
         extract( $params, EXTR_SKIP );
 
+        // Set item_id if not passed
         if ( !$item_id ) {
                 if ( 'user' == $object )
@@ -80 +101 @@
         }
 
+        // Set avatar_dir if not passed (uses $object)
         if ( !$avatar_dir ) {
                 if ( 'user' == $object )
@@ -93 +115 @@
         }
 
-        /* Add an identifying class to each item */
+        // Add an identifying class to each item
         $class .= ' ' . $object . '-' . $item_id . '-avatar';
 
-        if ( !empty($css_id) )
+        // Set CSS ID if passed
+        if ( !empty( $css_id ) )
                 $css_id = " id='{$css_id}'";
 
+        // Set avatar width
         if ( $width )
                 $html_width = " width='{$width}'";
@@ -104 +128 @@
                 $html_width = ( 'thumb' == $type ) ? ' width="' . BP_AVATAR_THUMB_WIDTH . '"' : ' width="' . BP_AVATAR_FULL_WIDTH . '"';
 
+        // Set avatar height
         if ( $height )
                 $html_height = " height='{$height}'";
@@ -109 +134 @@
                 $html_height = ( 'thumb' == $type ) ? ' height="' . BP_AVATAR_THUMB_HEIGHT . '"' : ' height="' . BP_AVATAR_FULL_HEIGHT . '"';
 
-        $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', str_replace( WP_CONTENT_DIR, BP_AVATAR_URL, BP_AVATAR_UPLOAD_PATH ) . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
+        // Set avatar URL and DIR based on prepopulated constants
+        $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', BP_AVATAR_URL . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
         $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', BP_AVATAR_UPLOAD_PATH . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
 
@@ -117 +143 @@
          * or thumbnail image.
          */
-        $avatar_name = ( 'full' == $type ) ? '-bpfull' : '-bpthumb';
+        $avatar_size = ( 'full' == $type ) ? '-bpfull' : '-bpthumb';
         $legacy_user_avatar_name = ( 'full' == $type ) ? '-avatar2' : '-avatar1';
         $legacy_group_avatar_name = ( 'full' == $type ) ? '-groupavatar-full' : '-groupavatar-thumb';
 
+        // Check for directory
         if ( file_exists( $avatar_folder_dir ) ) {
+
+                // Open directory
                 if ( $av_dir = opendir( $avatar_folder_dir ) ) {
+
+                        // Stash files in an array once to check for one that matches
+                        $avatar_files = array();
                         while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
-                                if ( preg_match( "/{$avatar_name}/", $avatar_file ) || preg_match( "/{$legacy_user_avatar_name}/", $avatar_file ) || preg_match( "/{$legacy_group_avatar_name}/", $avatar_file ) )
-                                        $avatar_url = $avatar_folder_url . '/' . $avatar_file;
+                                // Only add files to the array (skip directories)
+                                if ( 2 < strlen( $avatar_file ) )
+                                        $avatar_files[] = $avatar_file;
+                        }
+
+                        // Check for array
+                        if ( 0 < count( $avatar_files ) ) {
+
+                                // Check for current avatar
+                                foreach( $avatar_files as $key => $value ) {
+                                        if ( strpos ( $value, $avatar_size )!== false )
+                                                $avatar_url = $avatar_folder_url . '/' . $avatar_files[$key];
+                                }
+
+                                // Legacy avatar check
+                                if ( !isset( $avatar_url ) ) {
+                                        foreach( $avatar_files as $key => $value ) {
+                                                if ( strpos ( $value, $legacy_user_avatar_name )!== false )
+                                                        $avatar_url = $avatar_folder_url . '/' . $avatar_files[$key];
+                                        }
+
+                                        // Legacy group avatar check
+                                        if ( !isset( $avatar_url ) ) {
+                                                foreach( $avatar_files as $key => $value ) {
+                                                        if ( strpos ( $value, $legacy_group_avatar_name )!== false )
+                                                                $avatar_url = $avatar_folder_url . '/' . $avatar_files[$key];
+                                                }
+                                        }
+                                }
                         }
                 }
-                closedir($av_dir);
-
-                if ( $avatar_url )
-                        return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
-        }
-
-        /* If no avatars have been uploaded for this item, display a gravatar */
+
+                // Close the avatar directory
+                closedir( $av_dir );
+
+                // If we found a locally uploaded avatar
+                if ( $avatar_url ) {
+
+                        // Return it wrapped in an <img> element
+                        if ( true === $html ) {
+                                return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $avatar_url . '" alt="' . $alt . '" class="' . $class . '"' . $css_id . $html_width . $html_height . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
+
+                        // ...or only the URL
+                        } else {
+                                return apply_filters( 'bp_core_fetch_avatar_url', $avatar_url );
+                        }
+                }
+        }
+
+        // If no avatars could be found, try to display a gravatar
+
+        // Skips gravatar check if $no_grav is passed
         if ( !$no_grav ) {
+
+                // Set gravatar size
+                if ( $width )
+                        $grav_size = $width;
+                else if ( 'full' == $type )
+                        $grav_size = BP_AVATAR_FULL_WIDTH;
+                else if ( 'thumb' == $type )
+                        $grav_size = BP_AVATAR_THUMB_WIDTH;
+
+                // Set gravatar type
                 if ( empty( $bp->grav_default->{$object} ) )
                         $default_grav = 'wavatar';
                 else if ( 'mystery' == $bp->grav_default->{$object} )
-                        $default_grav = apply_filters( 'bp_core_mysteryman_src', BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg' );
+                        $default_grav = apply_filters( 'bp_core_mysteryman_src', BP_AVATAR_DEFAULT, $grav_size );
                 else
                         $default_grav = $bp->grav_default->{$object};
 
-                if ( $width ) $grav_size = $width;
-                else if ( 'full' == $type ) $grav_size = BP_AVATAR_FULL_WIDTH;
-                else if ( 'thumb' == $type ) $grav_size = BP_AVATAR_THUMB_WIDTH;
-
+                // Set gravatar object
                 if ( empty( $email ) ) {
                         if ( 'user' == $object ) {
@@ -155 +235 @@
                 }
 
+                // Set host based on if using ssl
                 if ( is_ssl() )
                         $host = 'https://secure.gravatar.com/avatar/';
@@ -160 +241 @@
                         $host = 'http://www.gravatar.com/avatar/';
 
-                $email = apply_filters( 'bp_core_gravatar_email', $email, $item_id, $object );
-                $gravatar = apply_filters( 'bp_gravatar_url', $host ) . md5( $email ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
-
-                return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
+                // Filter gravatar vars
+                $email          = apply_filters( 'bp_core_gravatar_email', $email, $item_id, $object );
+                $gravatar       = apply_filters( 'bp_gravatar_url', $host ) . md5( strtolower( $email ) ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
+
+                // Return gravatar wrapped in <img />
+                if ( true === $html )
+                        return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $gravatar . '" alt="' . $alt . '" class="' . $class . '"' . $css_id . $html_width . $html_height . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
+
+                // ...or only return the gravatar URL
+                else
+                        return apply_filters( 'bp_core_fetch_avatar_url', $gravatar );
+
         } else {
                 return apply_filters( 'bp_core_fetch_avatar', false, $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
@@ -275 +364 @@
         }
 
-        /* Resize the image down to something manageable and then delete the original */
-        if ( getimagesize( $bp->avatar_admin->original['file'] ) > BP_AVATAR_ORIGINAL_MAX_WIDTH )
-                $bp->avatar_admin->resized = wp_create_thumbnail( $bp->avatar_admin->original['file'], BP_AVATAR_ORIGINAL_MAX_WIDTH );
-
-        $bp->avatar_admin->image = new stdClass;
+        /* Get image size */
+        $size = @getimagesize( $bp->avatar_admin->original['file'] );
+
+        /* Check image size and shrink if too large */
+        if ( $size[0] > BP_AVATAR_ORIGINAL_MAX_WIDTH ) {
+                $thumb = wp_create_thumbnail( $bp->avatar_admin->original['file'], BP_AVATAR_ORIGINAL_MAX_WIDTH );
+
+                /* Check for thumbnail creation errors */
+                if ( is_wp_error( $thumb ) ) {
+                        bp_core_add_message( sprintf( __( 'Upload Failed! Error was: %s', 'buddypress' ), $thumb->get_error_message() ), 'error' );
+                        return false;
+                }
+
+                /* Thumbnail is good so proceed */
+                $bp->avatar_admin->resized = $thumb;
+        }
 
         /* We only want to handle one image after resize. */
         if ( empty( $bp->avatar_admin->resized ) )
-                $bp->avatar_admin->image->dir = $bp->avatar_admin->original['file'];
+                $bp->avatar_admin->image->dir = str_replace( BP_AVATAR_UPLOAD_PATH, '', $bp->avatar_admin->original['file'] );
         else {
-                $bp->avatar_admin->image->dir = $bp->avatar_admin->resized;
+                $bp->avatar_admin->image->dir = str_replace( BP_AVATAR_UPLOAD_PATH, '', $bp->avatar_admin->resized );
                 @unlink( $bp->avatar_admin->original['file'] );
         }
 
         /* Set the url value for the image */
-        $bp->avatar_admin->image->url = str_replace( WP_CONTENT_DIR, BP_AVATAR_URL, $bp->avatar_admin->image->dir );
+        $bp->avatar_admin->image->url = BP_AVATAR_URL . $bp->avatar_admin->image->dir;
 
         return true;
@@ -323 +423 @@
                 return false;
 
-        if ( !file_exists( WP_CONTENT_DIR . '/' . $original_file ) )
+        $original_file = BP_AVATAR_UPLOAD_PATH . $original_file;
+
+        if ( !file_exists( $original_file ) )
                 return false;
 
         if ( !$item_id )
-                $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . dirname( $original_file ), $item_id, $object, $avatar_dir );
+                $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', dirname( $original_file ), $item_id, $object, $avatar_dir );
         else
                 $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', BP_AVATAR_UPLOAD_PATH . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
@@ -352 +454 @@
 
         /* Crop the image */
-        $full_cropped = wp_crop_image( WP_CONTENT_DIR . $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_FULL_WIDTH, BP_AVATAR_FULL_HEIGHT, false, $avatar_folder_dir . '/' . $full_filename );
-        $thumb_cropped = wp_crop_image( WP_CONTENT_DIR . $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_THUMB_WIDTH, BP_AVATAR_THUMB_HEIGHT, false, $avatar_folder_dir . '/' . $thumb_filename );
+        $full_cropped = wp_crop_image( $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_FULL_WIDTH, BP_AVATAR_FULL_HEIGHT, false, $avatar_folder_dir . '/' . $full_filename );
+        $thumb_cropped = wp_crop_image( $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_THUMB_WIDTH, BP_AVATAR_THUMB_HEIGHT, false, $avatar_folder_dir . '/' . $thumb_filename );
 
         /* Remove the original */
-        @unlink( WP_CONTENT_DIR . $original_file );
+        @unlink( $original_file );
 
         return true;
 }
 
-// Override internal "get_avatar()" function to use our own where possible
+/**
+ * bp_core_fetch_avatar_filter()
+ *
+ * Attempts to filter get_avatar function and let BuddyPress have a go
+ * at finding an avatar that may have been uploaded locally.
+ *
+ * @global array $authordata
+ * @param string $avatar The result of get_avatar from before-filter
+ * @param int|string|object $user A user ID, email address, or comment object
+ * @param int $size Size of the avatar image (thumb/full)
+ * @param string $default URL to a default image to use if no avatar is available
+ * @param string $alt Alternate text to use in image tag. Defaults to blank
+ * @return <type>
+ */
 function bp_core_fetch_avatar_filter( $avatar, $user, $size, $default, $alt ) {
-        global $authordata;
-
+        global $pagenow;
+
+        // Do not filter if inside WordPress options page
+        if ( 'options-discussion.php' == $pagenow )
+                return $avatar;
+
+        // If passed an object, assume $user->user_id
         if ( is_object( $user ) )
                 $id = $user->user_id;
+
+        // If passed a number, assume it was a $user_id
         else if ( is_numeric( $user ) )
                 $id = $user;
-        else
-                $id = $authordata->ID;
-
+
+        // If passed a string and that string returns a user, get the $id
+        else if ( is_string( $user ) && ( $user_by_email = get_user_by_email( $user ) ) )
+                $id = $user_by_email->ID;
+
+        // If somehow $id hasn't been assigned, return the result of get_avatar
         if ( empty( $id ) )
-                return $avatar;
-
+                return !empty( $avatar ) ? $avatar : $default;
+
+        // Let BuddyPress handle the fetching of the avatar
         $bp_avatar = bp_core_fetch_avatar( array( 'item_id' => $id, 'width' => $size, 'height' => $size, 'alt' => $alt ) );
 
+        // If BuddyPress found an avatar, use it. If not, use the result of get_avatar
         return ( !$bp_avatar ) ? $avatar : $bp_avatar;
 }
@@ -402 +529 @@
 }
 
+/**
+ * bp_core_avatar_upload_path()
+ *
+ * Returns the absolute upload path for the WP installation
+ *
+ * @global object $current_blog Current blog information
+ * @uses wp_upload_dir To get upload directory info
+ * @return string Absolute path to WP upload directory
+ */
 function bp_core_avatar_upload_path() {
-        if ( bp_core_is_multisite() )
-                $path = ABSPATH . get_blog_option( BP_ROOT_BLOG, 'upload_path' );
-        else {
-                if ( !$path = get_option( 'upload_path' ) )
-                        $path = WP_CONTENT_DIR . '/uploads';
-                else
-                        $path = ABSPATH . $path;
-        }
-
-        return apply_filters( 'bp_core_avatar_upload_path', $path );
-}
-
+        global $current_blog;
+
+        // Get upload directory information from current site
+        $upload_dir = wp_upload_dir();
+
+        // If multisite, and current blog does not match root blog, make adjustments
+        if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
+                $upload_dir['basedir'] = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
+
+        return apply_filters( 'bp_core_avatar_upload_path', $upload_dir['basedir'] );
+}
+
+/**
+ * bp_core_avatar_url()
+ *
+ * Returns the raw base URL for root site upload location
+ *
+ * @global object $current_blog Current blog information
+ * @uses wp_upload_dir To get upload directory info
+ * @return string Full URL to current upload location
+ */
 function bp_core_avatar_url() {
-        if ( !bp_core_is_multisite() )
-                return WP_CONTENT_URL;
-
-        return apply_filters( 'bp_core_avatar_url', get_blog_option( BP_ROOT_BLOG, 'siteurl' ) );
+        global $current_blog;
+
+        // Get upload directory information from current site
+        $upload_dir = wp_upload_dir();
+
+        // If multisite, and current blog does not match root blog, make adjustments
+        if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
+                $upload_dir['baseurl'] = str_replace( get_blog_option( $current_blog->blog_id, 'home' ) , get_blog_option( BP_ROOT_BLOG, 'home' ), $upload_dir['baseurl'] );
+
+        return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );
 }
 

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

@@ -107 +107 @@
         /* Static Functions */
 
-        function get_users( $type, $limit = null, $page = 1, $user_id = false, $include = false, $search_terms = false, $populate_extras = true ) {
+        function get_users( $type, $limit = null, $page = 1, $user_id = false, $search_terms = false, $populate_extras = true ) {
                 global $wpdb, $bp;
 
@@ -134 +134 @@
 
                 if ( 'online' == $type )
-                        $sql['where_online'] = "AND DATE_ADD( um.meta_value, INTERVAL 5 MINUTE ) >= UTC_TIMESTAMP()";
+                        $sql['where_online'] = "AND DATE_ADD( um.meta_value, INTERVAL 5 MINUTE ) >= NOW()";
 
                 if ( 'alphabetical' == $type )
                         $sql['where_alpha'] = "AND pd.field_id = 1";
 
-                if ( $include ) {
-                        if ( is_array( $include ) )
-                                $uids = $wpdb->escape( implode( ',', (array)$include ) );
-                        else
-                                $uids = $wpdb->escape( $include );
-
-                        if ( !empty( $uids ) )
-                                $sql['where_users'] = "AND u.ID IN ({$uids})";
-                }
-
-                else if ( $user_id && function_exists( 'friends_install' ) ) {
+                if ( $user_id && function_exists( 'friends_install' ) ) {
                         $friend_ids = friends_get_friend_user_ids( $user_id );
                         $friend_ids = $wpdb->escape( implode( ',', (array)$friend_ids ) );
@@ -261 +251 @@
         }
 
+        function get_specific_users( $user_ids, $limit = null, $page = 1, $populate_extras = true ) {
+                global $wpdb, $bp;
+
+                if ( $limit && $page )
+                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+
+                $user_sql = " AND user_id IN ( " . $wpdb->escape( $user_ids ) . " ) ";
+                $status_sql = bp_core_get_status_sql();
+
+                $total_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT ID) FROM " . CUSTOM_USER_TABLE . " WHERE {$status_sql} AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) " ), $wpdb->escape( $user_ids ) );
+                $paged_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT DISTINCT ID as id, user_registered, user_nicename, user_login, user_email FROM " . CUSTOM_USER_TABLE . " WHERE {$status_sql} AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) {$pag_sql}" ), $wpdb->escape( $user_ids ) );
+
+                $total_users = $wpdb->get_var( $total_users_sql );
+                $paged_users = $wpdb->get_results( $paged_users_sql );
+
+                /***
+                 * Lets fetch some other useful data in a separate queries, this will be faster than querying the data for every user in a list.
+                 * We can't add these to the main query above since only users who have this information will be returned (since the much of the data is in usermeta and won't support any type of directional join)
+                 */
+
+                /* Add additional data to the returned results */
+                if ( $populate_extras )
+                        $paged_users = BP_Core_User::get_user_extras( &$paged_users, &$user_ids );
+
+
+                return array( 'users' => $paged_users, 'total' => $total_users );
+        }
+
         function search_users( $search_terms, $limit = null, $page = 1, $populate_extras = true ) {
                 global $wpdb, $bp;
@@ -300 +318 @@
                 /* Fetch the user's full name */
                 if ( bp_is_active( 'xprofile' ) && 'alphabetical' != $type ) {
-                        /* Ensure xprofile globals are set */
-                        if ( !defined( 'BP_XPROFILE_FULLNAME_FIELD_NAME' ) )
-                                xprofile_setup_globals();
-
                         $names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id as id, pd.value as fullname FROM {$bp->profile->table_name_fields} pf, {$bp->profile->table_name_data} pd WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} )", BP_XPROFILE_FULLNAME_FIELD_NAME ) );
                         for ( $i = 0; $i < count( $paged_users ); $i++ ) {

trunk/bp-core/bp-core-cssjs.php

@@ -48 +48 @@
         global $current_blog;
 
-        if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
+        if ( $current_blog->blog_id != BP_ROOT_BLOG )
                 return false;
 ?>
@@ -175 +175 @@
         global $bp;
 
-        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) || ( (int)get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() ) ) {
+        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) || ( $bp->site_options['hide-loggedout-adminbar'] && !is_user_logged_in() ) ) {
         ?>
 <style type="text/css">body { padding-top: 0 !important; } #wp-admin-bar { display: none; }</style>

trunk/bp-core/bp-core-signup.php

@@ -181 +181 @@
 
                         /* Make sure we include the jQuery jCrop file for image cropping */
-                        add_action( 'wp_print_scripts', 'bp_core_add_jquery_cropper' );
+                        add_action( 'wp', 'bp_core_add_jquery_cropper' );
                 }
         }
@@ -256 +256 @@
  */
 
+/**
+ * bp_core_flush_illegal_names()
+ *
+ * Flush illegal names by getting and setting 'illegal_names' site option
+ */
+function bp_core_flush_illegal_names() {
+        $illegal_names = get_site_option( 'illegal_names' );
+        update_site_option( 'illegal_names', $illegal_names );
+}
+
+/**
+ * bp_core_illegal_names()
+ *
+ * Filter the illegal_names site option and make sure it includes a few
+ * specific BuddyPress and Multi-site slugs
+ *
+ * @param array|string $value Illegal names from field
+ * @param array|string $oldvalue The value as it is currently
+ * @return array Merged and unique array of illegal names
+ */
+function bp_core_illegal_names( $value = '', $oldvalue = '' ) {
+
+        // Make sure $value is array
+        if ( empty( $value ) )
+                $db_illegal_names = array();
+        if ( is_array( $value ) )
+                $db_illegal_names = $value;
+        elseif ( is_string( $value ) )
+                $db_illegal_names = implode( ' ', $names );
+
+        // Add our slugs to the array and allow them to be filtered
+        $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', BP_GROUPS_SLUG, BP_MEMBERS_SLUG, BP_FORUMS_SLUG, BP_BLOGS_SLUG, BP_ACTIVITY_SLUG, BP_XPROFILE_SLUG, BP_FRIENDS_SLUG, BP_SEARCH_SLUG, BP_SETTINGS_SLUG, BP_REGISTER_SLUG, BP_ACTIVATION_SLUG ) );
+
+        // Merge the arrays together
+        $merged_names = array_merge( (array)$filtered_illegal_names, (array)$db_illegal_names );
+
+        // Remove duplicates
+        $illegal_names = array_unique( (array)$merged_names );
+
+        return apply_filters( 'bp_core_illegal_names', $illegal_names );
+}
+add_filter( 'pre_update_site_option_illegal_names', 'bp_core_illegal_names', 10, 2 );
+
+/**
+ * bp_core_validate_user_signup()
+ *
+ * Validate a user name and email address when creating a new user.
+ *
+ * @global object $wpdb DB Layer
+ * @param string $user_name Username to validate
+ * @param string $user_email Email address to validate
+ * @return array Results of user validation including errors, if any
+ */
 function bp_core_validate_user_signup( $user_name, $user_email ) {
-        global $wpdb, $bp;
+        global $wpdb;
 
         $errors = new WP_Error();
@@ -268 +321 @@
         preg_match( "/[a-z0-9]+/", $user_name, $maybe );
 
-        $db_illegal_names = get_site_option( 'illegal_names' );
-        $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', BP_GROUPS_SLUG, $bp->members->slug, BP_FORUMS_SLUG, BP_BLOGS_SLUG, BP_REGISTER_SLUG, BP_ACTIVATION_SLUG ) );
-
-        /* Safely merge our illegal names into existing site_option */
-        $common_names                   = array_intersect( (array)$db_illegal_names, (array)$filtered_illegal_names );
-        $diff_names                             = array_diff( (array)$db_illegal_names, (array)$filtered_illegal_names );
-        $illegal_names                  = array_merge( (array)$diff_names, (array)$common_names );
-
-        update_site_option( 'illegal_names', $illegal_names );
-
-        if ( in_array( $user_name, (array)$illegal_names ) )
-                $errors->add( 'user_name', __( 'Sorry, that username is not allowed', 'buddypress' ) );
-
-        if ( !validate_username( $user_name ) || $user_name != $maybe[0] )
+        // Make sure illegal names include BuddyPress slugs and values
+        bp_core_flush_illegal_names();
+
+        if ( !validate_username( $user_name ) || in_array( $user_name, (array)$illegal_names ) || $user_name != $maybe[0] )
                 $errors->add( 'user_name', __( 'Only lowercase letters and numbers allowed', 'buddypress' ) );
 
@@ -382 +425 @@
                 if ( !bp_core_is_multisite() ) {
                         $activation_key = wp_hash( $user_id );
-                        update_usermeta( $user_id, 'activation_key', $activation_key );
+                        update_user_meta( $user_id, 'activation_key', $activation_key );
                         bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key );
                 }
@@ -445 +488 @@
 
                 /* Remove the activation key meta */
-                delete_usermeta( $user_id, 'activation_key' );
+                delete_user_meta( $user_id, 'activation_key' );
         }
 
@@ -452 +495 @@
 
         /* Add a last active entry */
-        update_usermeta( $user_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+        update_user_meta( $user_id, 'last_activity', bp_core_current_time() );
 
         /* Set the password on multisite installs */
@@ -495 +538 @@
 
         /* Add a last active entry */
-        update_usermeta( $user_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+        update_user_meta( $user_id, 'last_activity', bp_core_current_time() );
 
         /* Add the user's fullname to Xprofile */
         if ( function_exists( 'xprofile_set_field_data' ) ) {
-                $firstname = get_usermeta( $user_id, 'first_name' );
-                $lastname = ' ' . get_usermeta( $user_id, 'last_name' );
+                $firstname = get_user_meta( $user_id, 'first_name', true );
+                $lastname = ' ' . get_user_meta( $user_id, 'last_name', true );
                 $name = $firstname . $lastname;
 
                 if ( empty( $name ) || ' ' == $name )
-                        $name = get_usermeta( $user_id, 'nickname' );
+                        $name = get_user_meta( $user_id, 'nickname', true );
 
                 xprofile_set_field_data( 1, $user_id, $name );
@@ -523 +566 @@
                 @wp_mkdir_p( $path );
 
-        $newurl = str_replace( BP_AVATAR_UPLOAD_PATH, BP_AVATAR_URL, $path );
+        $newurl = BP_AVATAR_URL . '/avatars/signups/' . $bp->signup->avatar_dir;
         $newburl = $newurl;
         $newsubdir = '/avatars/signups/' . $bp->signup->avatar_dir;
@@ -532 +575 @@
 function bp_core_signup_send_validation_email( $user_id, $user_email, $key ) {
         $activate_url = bp_get_activation_page() ."?key=$key";
-        $activate_url = clean_url( $activate_url );
+        $activate_url = esc_url( $activate_url );
         $admin_email = get_site_option( "admin_email" );
 

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

@@ -27 +27 @@
                 if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
                         $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page, $populate_extras );
-                } else {
-                        $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras ) );
+                }
+                else if ( false !== $include ) {
+                        $this->members = BP_Core_User::get_specific_users( $include, $this->pag_num, $this->pag_page, $populate_extras );
+                }
+                else {
+                        $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras ) );
                 }
 
@@ -160 +164 @@
 
         $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras );
-        return apply_filters( 'bp_has_members', $members_template->has_members(), &$members_template );
+
+        return $members_template->has_members();
 }
 
@@ -312 +317 @@
 
                 // Populate the user if it hasn't been already.
-                if ( empty( $members_template->member->profile_data ) && method_exists( 'BP_XProfile_ProfileData', 'get_all_for_user' ) )
-                        $members_template->member->profile_data = BP_XProfile_ProfileData::get_all_for_user( $members_template->member->id );
+                if ( empty( $members_template->member->profile_data ) )
+                        $members_template->member = new BP_Core_User( $members_template->member->id );
 
                 $data = xprofile_format_profile_field( $members_template->member->profile_data[$field]['field_type'], $members_template->member->profile_data[$field]['field_data'] );
@@ -676 +681 @@
 function bp_is_home() { return bp_is_my_profile(); }
 
+function bp_get_loggedin_user_link() {
+        global $bp;
+
+        return $bp->loggedin_user->domain;
+}
+
+function bp_get_displayed_user_link() {
+        global $bp;
+
+        return $bp->displayed_user->domain;
+}
+
 function bp_last_activity( $user_id = false, $echo = true ) {
         global $bp;
@@ -690 +707 @@
 }
 
-function bp_user_firstname( $name = false ) {
-        echo bp_get_user_firstname( $name );
+function bp_user_firstname() {
+        echo bp_get_user_firstname();
 }
         function bp_get_user_firstname( $name = false ) {
@@ -708 +725 @@
 
         echo apply_filters( 'bp_the_avatar_thumbnail', $bp->displayed_user->domain );
-}
-
-function bp_get_loggedin_user_link() {
-        global $bp;
-
-        return $bp->loggedin_user->domain;
-}
-
-function bp_get_displayed_user_link() {
-        global $bp;
-
-        return $bp->displayed_user->domain;
 }
 
@@ -919 +924 @@
         } else if ( bp_is_activation_page() ) {
                 $title = __( 'Activate your Account', 'buddypress' );
-
-        } else if ( bp_is_group_create() ) {
-                $title = __( 'Create a Group', 'buddypress' );
-
-        } else if ( bp_is_create_blog() ) {
-                $title = __( 'Create a Blog', 'buddypress' );
         }
 
@@ -990 +989 @@
 
 function bp_search_form_type_select() {
-        global $bp;
-
         // Eventually this won't be needed and a page will be built to integrate all search results.
         $selection_box = '<select name="search-which" id="search-which" style="width: auto">';
@@ -1180 +1177 @@
 
 function bp_signup_avatar( $args = '' ) {
-        echo bp_get_signup_avatar( $args = '' );
+        echo bp_get_signup_avatar( $args );
 }
         function bp_get_signup_avatar( $args = '' ) {
@@ -1206 +1203 @@
 
                         $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
-                        return apply_filters( 'bp_get_signup_avatar', '<img src="' . $gravatar_url . md5( $_POST['signup_email'] ) . '?d=' . $default_grav . '&amp;s=' . $size ) . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
+                        $gravatar_img = '<img src="' . $gravatar_url . md5( strtolower( $_POST['signup_email'] ) ) . '?d=' . $default_grav . '&amp;s=' . $size . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
                 } else {
-                        return apply_filters( 'bp_get_signup_avatar', bp_core_fetch_avatar( array( 'item_id' => $signup_avatar_dir, 'object' => 'signup', 'avatar_dir' => 'avatars/signups', 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) ) );
+                        $gravatar_img = bp_core_fetch_avatar( array( 'item_id' => $signup_avatar_dir, 'object' => 'signup', 'avatar_dir' => 'avatars/signups', 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) );
                 }
+
+                return apply_filters( 'bp_get_signup_avatar', $gravatar_img );
         }
 
@@ -1251 +1250 @@
 
 function bp_registration_needs_activation() {
-        return apply_filters( 'bp_registration_needs_activation', true );
+        return apply_filters( 'bp_registration_needs_activation', bp_core_is_multisite() );
 }
 

trunk/bp-core/bp-core-wpabstraction.php

@@ -90 +90 @@
         }
 }
+
+if ( !function_exists( 'wpmu_validate_user_signup' ) ) {
+        function wpmu_validate_user_signup( $user_name, $user_email ) {
+                global $wpdb;
+
+                $errors = new WP_Error();
+
+                $user_email = sanitize_email( $user_email );
+
+                if ( empty( $user_name ) )
+                        $errors->add('user_name', __("Please enter a username"));
+
+                $maybe = array();
+                preg_match( "/[a-z0-9]+/", $user_name, $maybe );
+
+                $illegal_names = get_site_option( "illegal_names" );
+                if( is_array( $illegal_names ) == false ) {
+                        $illegal_names = array(  "www", "web", "root", "admin", "main", "invite", "administrator" );
+                        add_site_option( "illegal_names", $illegal_names );
+                }
+
+                if ( !validate_username( $user_name ) || in_array( $user_name, $illegal_names ) == true || $user_name != $maybe[0] ) {
+                    $errors->add('user_name', __("Only lowercase letters and numbers allowed"));
+                }
+
+                if( strlen( $user_name ) < 4 ) {
+                    $errors->add('user_name',  __("Username must be at least 4 characters"));
+                }
+
+                if ( strpos( " " . $user_name, "_" ) != false )
+                        $errors->add('user_name', __("Sorry, usernames may not contain the character '_'!"));
+
+                // all numeric?
+                $match = array();
+                preg_match( '/[0-9]*/', $user_name, $match );
+                if ( $match[0] == $user_name )
+                        $errors->add('user_name', __("Sorry, usernames must have letters too!"));
+
+                if ( !is_email( $user_email ) )
+                        $errors->add('user_email', __("Please check your email address."));
+
+                $limited_email_domains = get_site_option( 'limited_email_domains' );
+                if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
+                        $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
+                        if( in_array( $emaildomain, $limited_email_domains ) == false ) {
+                                $errors->add('user_email', __("Sorry, that email address is not allowed!"));
+                        }
+                }
+
+                // Check if the username has been used already.
+                if ( username_exists($user_name) )
+                        $errors->add('user_name', __("Sorry, that username already exists!"));
+
+                // Check if the email address has been used already.
+                if ( email_exists($user_email) )
+                        $errors->add('user_email', __("Sorry, that email address is already used!"));
+
+                $result = array('user_name' => $user_name, 'user_email' => $user_email, 'errors' => $errors);
+
+                return apply_filters('wpmu_validate_user_signup', $result);
+        }
+}
+?>

trunk/bp-forums.php

@@ -441 +441 @@
                 $post_position = $post->post_position;
 
-        $post_id = bb_insert_post( array( 'post_id' => $post_id, 'topic_id' => $topic_id, 'post_text' => stripslashes( trim( $post_text ) ), 'post_time' => $post_time, 'poster_id' => $poster_id, 'poster_ip' => $poster_ip, 'post_status' => $post_status, 'post_position' => $post_position ) );
-
-        if ( $post_id )
+        $post = bb_insert_post( array( 'post_id' => $post_id, 'topic_id' => $topic_id, 'post_text' => stripslashes( trim( $post_text ) ), 'post_time' => $post_time, 'poster_id' => $poster_id, 'poster_ip' => $poster_ip, 'post_status' => $post_status, 'post_position' => $post_position ) );
+
+        if ( $post )
                 do_action( 'bp_forums_new_post', $post_id );
 
-        return $post_id;
+        return $post;
 }
 

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

@@ -290 +290 @@
                 global $forum_template;
 
-                $poster_id = ( empty( $forum_template->topic->poster_id ) ) ? $forum_template->topic->topic_poster : $forum_template->topic->poster_id;
-
-                if ( !$name = bp_core_get_userlink( $poster_id ) )
+                if ( !$name = bp_core_get_userlink( $forum_template->topic->poster_id ) )
                         return __( 'Deleted User', 'buddypress' );
 
@@ -464 +462 @@
                 global $forum_template;
 
-                return apply_filters( 'bp_get_the_topic_total_posts', $forum_template->topic->topic_posts );
+                return $forum_template->topic->topic_posts;
         }
 

trunk/bp-friends.php

@@ -566 +566 @@
         do_action( 'friends_remove_data', $user_id );
 }
-add_action( 'wpmu_delete_user', 'friends_remove_data' );
-add_action( 'delete_user', 'friends_remove_data' );
-add_action( 'make_spam_user', 'friends_remove_data' );
+add_action( 'wpmu_delete_user', 'friends_remove_data', 1 );
+add_action( 'delete_user', 'friends_remove_data', 1 );
+add_action( 'make_spam_user', 'friends_remove_data', 1 );
 
 
@@ -595 +595 @@
         global $bp;
 
-        if ( isset( $_GET['new'] ) )
-                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->friends->id, 'friendship_accepted' );
+        if ( isset($_GET['new']) )
+                bp_core_delete_notifications_for_user_by_type( $bp->displayed_user->id, $bp->friends->id, 'friendship_accepted' );
 }
 add_action( 'bp_activity_screen_my_activity', 'friends_clear_friend_notifications' );

trunk/bp-groups.php

@@ -492 +492 @@
 
         if ( $bp->is_single_item ) {
-                /* Refresh the group member count meta */
-                groups_update_groupmeta( $bp->groups->current_group->id, 'total_member_count', groups_get_total_member_count( $bp->groups->current_group->id ) );
-
                 do_action( 'groups_screen_group_members', $bp->groups->current_group->id );
                 bp_core_load_template( apply_filters( 'groups_template_group_members', 'groups/single/home' ) );
@@ -798 +795 @@
 
         if ( $bp->current_component == $bp->groups->slug && 'membership-requests' == $bp->action_variables[0] ) {
-
-                /* Ask for a login if the user is coming here via an email notification */
-                if ( !is_user_logged_in() )
-                        bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/membership-requests/' ) );
 
                 if ( !$bp->is_item_admin || 'public' == $bp->groups->current_group->status )
@@ -1653 +1646 @@
 }
 
-function groups_get_total_member_count( $group_id ) {
-        return BP_Groups_Group::get_total_member_count( $group_id );
-}
-
 /*** Group Fetching, Filtering & Searching  *************************************/
 
@@ -1814 +1803 @@
         groups_update_groupmeta( $group_id, 'forum_id', $forum_id );
 
-        do_action( 'groups_new_group_forum', $forum_id, $group_id );
+        do_action( 'groups_new_group_forum', $forum, $group_id );
 }
 
@@ -2417 +2406 @@
         do_action( 'groups_remove_data_for_user', $user_id );
 }
-add_action( 'wpmu_delete_user', 'groups_remove_data_for_user' );
-add_action( 'delete_user', 'groups_remove_data_for_user' );
-add_action( 'make_spam_user', 'groups_remove_data_for_user' );
+add_action( 'wpmu_delete_user', 'groups_remove_data_for_user', 1 );
+add_action( 'delete_user', 'groups_remove_data_for_user', 1 );
+add_action( 'make_spam_user', 'groups_remove_data_for_user', 1 );
 
 

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

@@ -634 +634 @@
                 groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) );
 
-                $group_count = get_usermeta( $this->user_id, 'total_group_count' );
+                $group_count = get_user_meta( $this->user_id, 'total_group_count', true );
                 if ( !empty( $group_count ) )
-                        update_usermeta( $this->user_id, 'total_group_count', (int)$group_count - 1 );
+                        update_user_meta( $this->user_id, 'total_group_count', (int)$group_count - 1 );
 
                 return $this->save();
@@ -648 +648 @@
 
                 groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) + 1 ) );
-                update_usermeta( $this->user_id, 'total_group_count', (int)get_usermeta( $this->user_id, 'total_group_count' ) + 1 );
+                update_user_meta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
 
                 return $this->save();
@@ -656 +656 @@
                 $this->inviter_id = 0;
                 $this->is_confirmed = 1;
-                $this->date_modified = gmdate( "Y-m-d H:i:s" );
+                $this->date_modified = bp_core_current_time();
         }
 
         function accept_request() {
                 $this->is_confirmed = 1;
-                $this->date_modified = gmdate( "Y-m-d H:i:s" );
+                $this->date_modified = bp_core_current_time();
+        }
+
+        function remove( $user_id, $group_id ) {
+                global $wpdb, $bp;
+
+                $sql = $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id );
+
+                if ( !$result = $wpdb->query( $sql ) )
+                        return false;
+
+                groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) );
+
+                $group_count = get_user_meta( $this->user_id, 'total_group_count', true );
+                if ( !empty( $group_count ) )
+                        update_user_meta( $this->user_id, 'total_group_count', (int)$group_count - 1 );
+
+                return $result;
         }
 
@@ -758 +775 @@
                         $user_id = $bp->displayed_user->id;
 
-                if ( $user_id != $bp->loggedin_user->id && !is_site_admin() ) {
+                if ( $user_id != $bp->loggedin_user->id && !is_super_admin() ) {
                         return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $user_id ) );
                 } else {
@@ -795 +812 @@
         }
 
+        function delete_request( $user_id, $group_id ) {
+                global $wpdb, $bp;
+
+                if ( !$user_id )
+                        return false;
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id = 0 AND invite_sent = 0", $user_id, $group_id ) );
+        }
+
         function check_is_admin( $user_id, $group_id ) {
                 global $wpdb, $bp;
@@ -829 +855 @@
 
                 return $wpdb->get_var( $wpdb->prepare( "SELECT is_banned FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );
+        }
+
+        /**
+         * Is the specified user the creator of the group?
+         *
+         * @global object $bp BuddyPress global settings
+         * @global wpdb $wpdb WordPress database object
+         * @param int $user_id
+         * @param int $group_id
+         * @since 1.2.6
+         */
+        function check_is_creator( $user_id, $group_id ) {
+                global $bp, $wpdb;
+
+                if ( !$user_id )
+                        return false;
+
+                return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name} WHERE creator_id = %d AND id = %d", $user_id, $group_id ) );
         }
 
@@ -888 +932 @@
 
                 if ( bp_is_active( 'xprofile' ) )
-                        $members = $wpdb->get_results( apply_filters( 'bp_group_members_user_join_filter', $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, pd.value as display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u, {$bp->profile->table_name_data} pd WHERE u.ID = m.user_id AND u.ID = pd.user_id AND pd.field_id = 1 AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) ) );
+                        $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, pd.value as display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u, {$bp->profile->table_name_data} pd WHERE u.ID = m.user_id AND u.ID = pd.user_id AND pd.field_id = 1 AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) );
                 else
-                        $members = $wpdb->get_results( apply_filters( 'bp_group_members_user_join_filter', $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u WHERE u.ID = m.user_id AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) ) );
+                        $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, u.display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u WHERE u.ID = m.user_id AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) );
 
                 if ( !$members )
@@ -898 +942 @@
                         $total_member_count = count($members);
                 else
-                        $total_member_count = $wpdb->get_var( apply_filters( 'bp_group_members_count_user_join_filter', $wpdb->prepare( "SELECT COUNT(user_id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql}", $group_id ) ) );
+                        $total_member_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(user_id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_sql}", $group_id ) );
 
                 /* Fetch whether or not the user is a friend */
@@ -904 +948 @@
                 $user_ids = $wpdb->escape( join( ',', (array)$user_ids ) );
 
-                if ( bp_is_active( 'friends' ) ) {
+                if ( function_exists( 'friends_install' ) ) {
                         $friend_status = $wpdb->get_results( $wpdb->prepare( "SELECT initiator_user_id, friend_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id IN ( {$user_ids} ) ) OR (initiator_user_id IN ( {$user_ids} ) AND friend_user_id = %d )", $bp->loggedin_user->id, $bp->loggedin_user->id ) );
                         for ( $i = 0; $i < count( $members ); $i++ ) {
@@ -923 +967 @@
         }
 
+        /**
+         * Delete all group membership information for the specified user
+         *
+         * @global object $bp BuddyPress global settings
+         * @global wpdb $wpdb WordPress database object
+         * @param int $user_id
+         * @since 1.0
+         * @uses BP_Groups_Member
+         */
         function delete_all_for_user( $user_id ) {
-                global $wpdb, $bp;
+                global $bp, $wpdb;
+
+                // Get all the group ids for the current user's groups and update counts
+                $group_ids = BP_Groups_Member::get_group_ids( $user_id );
+                foreach ( $group_ids['groups'] as $group_id ) {
+                        groups_update_groupmeta( $group_id, 'total_member_count', groups_get_total_member_count( $group_id ) - 1 );
+
+                        // If current user is the creator of a group and is the sole admin, delete that group to avoid counts going out-of-sync
+                        if ( groups_is_user_admin( $user_id, $group_id ) && count( groups_get_group_admins( $group_id ) ) < 2 && groups_is_user_creator( $user_id, $group_id ) )
+                                groups_delete_group( $group_id );
+                }
 
                 return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d", $user_id ) );
@@ -994 +1057 @@
                 global $bp;
 
-                /* When we are viewing a single group, add the group extension nav item */
-                if ( $this->visbility == 'public' || ( $this->visbility != 'public' && $bp->groups->current_group->user_has_access ) ) {
-                        if ( $this->enable_nav_item ) {
-                                if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item )
-                                        bp_core_new_subnav_item( array( 'name' => ( !$this->nav_item_name ) ? $this->name : $this->nav_item_name, 'slug' => $this->slug, 'parent_slug' => BP_GROUPS_SLUG, 'parent_url' => bp_get_group_permalink( $bp->groups->current_group ), 'position' => $this->nav_item_position, 'item_css_id' => 'nav-' . $this->slug, 'screen_function' => array( &$this, '_display_hook' ), 'user_has_access' => $this->enable_nav_item ) );
-
-                                /* When we are viewing the extension display page, set the title and options title */
-                                if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && $bp->current_action == $this->slug ) {
-                                        add_action( 'bp_template_content_header', create_function( '', 'echo "' . attribute_escape( $this->name ) . '";' ) );
-                                        add_action( 'bp_template_title', create_function( '', 'echo "' . attribute_escape( $this->name ) . '";' ) );
-                                }
-                        }
-
-                        /* Hook the group home widget */
-                        if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
-                                add_action( $this->display_hook, array( &$this, 'widget_display' ) );
-                }
-
                 if ( $this->enable_create_step ) {
-                        /* Insert the group creation step for the new group extension */
+                        // Insert the group creation step for the new group extension
                         $bp->groups->group_creation_steps[$this->slug] = array( 'name' => $this->name, 'slug' => $this->slug, 'position' => $this->create_step_position );
 
-                        /* Attach the group creation step display content action */
+                        // Attach the group creation step display content action
                         add_action( 'groups_custom_create_steps', array( &$this, 'create_screen' ) );
 
-                        /* Attach the group creation step save content action */
+                        // Attach the group creation step save content action
                         add_action( 'groups_create_group_step_save_' . $this->slug, array( &$this, 'create_screen_save' ) );
                 }
 
-                /* Construct the admin edit tab for the new group extension */
+                // Construct the admin edit tab for the new group extension
                 if ( $this->enable_edit_item ) {
-                        add_action( 'groups_admin_tabs', create_function( '$current, $group_slug', 'if ( "' . attribute_escape( $this->slug ) . '" == $current ) $selected = " class=\"current\""; echo "<li{$selected}><a href=\"' . $bp->root_domain . '/' . $bp->groups->slug . '/{$group_slug}/admin/' . attribute_escape( $this->slug ) . '\">' . attribute_escape( $this->name ) . '</a></li>";' ), 10, 2 );
-
-                        /* Catch the edit screen and forward it to the plugin template */
+                        add_action( 'groups_admin_tabs', create_function( '$current, $group_slug', 'if ( "' . esc_attr( $this->slug ) . '" == $current ) $selected = " class=\"current\""; echo "<li{$selected}><a href=\"' . $bp->root_domain . '/' . $bp->groups->slug . '/{$group_slug}/admin/' . esc_attr( $this->slug ) . '\">' . esc_attr( $this->name ) . '</a></li>";' ), 10, 2 );
+
+                        // Make sure user has access
+                        if ( !$bp->is_item_admin )
+                                return false;
+
+                        // Catch the edit screen and forward it to the plugin template
                         if ( $bp->current_component == $bp->groups->slug && 'admin' == $bp->current_action && $this->slug == $bp->action_variables[0] ) {
-                                $this->edit_screen_save();
+                                add_action( 'wp', array( &$this, 'edit_screen_save' ) );
                                 add_action( 'groups_custom_edit_steps', array( &$this, 'edit_screen' ) );
 
@@ -1041 +1090 @@
                         }
                 }
+
+                // When we are viewing a single group, add the group extension nav item
+                if ( $this->visibility == 'public' || ( $this->visibility != 'public' && $bp->groups->current_group->user_has_access ) ) {
+                        if ( $this->enable_nav_item ) {
+                                if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item )
+                                        bp_core_new_subnav_item( array( 'name' => ( !$this->nav_item_name ) ? $this->name : $this->nav_item_name, 'slug' => $this->slug, 'parent_slug' => BP_GROUPS_SLUG, 'parent_url' => bp_get_group_permalink( $bp->groups->current_group ), 'position' => $this->nav_item_position, 'item_css_id' => 'nav-' . $this->slug, 'screen_function' => array( &$this, '_display_hook' ), 'user_has_access' => $this->enable_nav_item ) );
+
+                                // When we are viewing the extension display page, set the title and options title
+                                if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && $bp->current_action == $this->slug ) {
+                                        add_action( 'bp_template_content_header', create_function( '', 'echo "' . esc_attr( $this->name ) . '";' ) );
+                                        add_action( 'bp_template_title', create_function( '', 'echo "' . esc_attr( $this->name ) . '";' ) );
+                                }
+                        }
+
+                        // Hook the group home widget
+                        if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
+                                add_action( $this->display_hook, array( &$this, 'widget_display' ) );
+                }
         }
 
@@ -1055 +1122 @@
                 return false;
 
-        /* Register the group extension on the plugins_loaded action so we have access to all plugins */
-        add_action( 'init', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "pre_get_posts", array( &$extension, "_register" ) );' ) );
+        /* Register the group extension on the bp_init action so we have access to all plugins */
+        add_action( 'bp_init', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "wp", array( &$extension, "_register" ), 2 );' ), 11 );
 }
 

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

@@ -1413 +1413 @@
                 $total = bp_core_number_format( $members_template->total_member_count );
 
-                return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total ) );
+                return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %s to %s (of %s members)', 'buddypress' ), $from_num, $to_num, $total ) );
         }
 

trunk/bp-loader.php

@@ -7 +7 @@
 Version: 1.3-bleeding
 Author URI: http://buddypress.org/developers/
-Network: true
 */
 
@@ -62 +61 @@
                 include( BP_PLUGIN_DIR . '/bp-xprofile.php' );
 
-        /* Allow dependent plugins to hook into BuddyPress in a safe way */
+        /**
+        * bp_loaded()
+        *
+        * Allow dependent plugins and core actions to attach themselves in a safe way.
+        *
+        * See bp-core.php for the following core actions:
+        *      - bp_init|bp_setup_globals|bp_setup_root_components|bp_setup_nav|bp_register_widgets
+        */
         function bp_loaded() {
-                do_action( 'bp_init' );
+                do_action( 'bp_loaded' );
         }
-        add_action( 'plugins_loaded', 'bp_loaded' );
+        add_action( 'plugins_loaded', 'bp_loaded', 20 );
 }
 

trunk/bp-messages/bp-messages-notifications.php

@@ -34 +34 @@
 ', 'buddypress' ), $sender_name, $subject, $content, $message_link );
 
-                $email_content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+                $content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
 
                 /* Send the message */

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

@@ -313 +313 @@
         $total = bp_core_number_format( $messages_template->total_thread_count );
 
-        echo sprintf( __( 'Viewing message %1$s to %2$s (of %3$s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
+        echo sprintf( __( 'Viewing message %s to %s (of %s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
         <span class="ajax-loader"></span><?php
 }

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

@@ -803 +803 @@
                 }
 
-        form.standard-form a.clear-value {
-                display: block;
-                margin-top: 5px;
-                outline: none;
-        }
-
 form.standard-form #basic-details-section, form.standard-form #blog-details-section,
 form.standard-form #profile-details-section {

trunk/bp-themes/bp-default/_inc/global.js

@@ -169 +169 @@
                                 if ( 'fav' == type ) {
                                         if ( !jq('div.item-list-tabs li#activity-favorites').length )
-                                                jq('div.item-list-tabs ul li#activity-mentions').before( '<li id="activity-favorites"><a href="#">' + bp_terms_my_favs + ' (<span>0</span>)</a></li>');
+                                                jq('div.item-list-tabs ul li#activity-mentions').before( '<li id="activity-favorites"><a href="#">' + BP_DTheme.my_favs + ' (<span>0</span>)</a></li>');
 
                                         target.removeClass('fav');
@@ -229 +229 @@
                 /* Load more updates at the end of the page */
                 if ( target.parent().attr('class') == 'load-more' ) {
-                        jq("li.load-more").addClass('loading');
+                        jq("#content li.load-more").addClass('loading');
 
                         if ( null == jq.cookie('bp-activity-oldestpage') )
@@ -243 +243 @@
                         function(response)
                         {
-                                jq("li.load-more").removeClass('loading');
+                                jq("#content li.load-more").removeClass('loading');
                                 jq.cookie( 'bp-activity-oldestpage', oldest_page, {path: '/'} );
-                                jq("ul.activity-list").append(response.contents);
+                                jq("#content ul.activity-list").append(response.contents);
 
                                 target.parent().hide();
@@ -461 +461 @@
         jq('span.highlight span').click( function() {
                 if ( !jq('div.help').length ) {
-                        jq(this).parent().after( '<div id="message" class="info help"><p>' + bp_terms_mention_explain + '</p></div>' );
+                        jq(this).parent().after( '<div id="message" class="info help"><p>' + BP_DTheme.mention_explain + '</p></div>' );
                         jq('div.help').hide().slideDown(200);
                 } else {
@@ -713 +713 @@
                                 button.fadeOut( 100, function() {
                                         if ( jq(this).hasClass('accept') ) {
-                                                jq(this).html( bp_terms_accepted ).fadeIn(50);
+                                                jq(this).html( BP_DTheme.accepted ).fadeIn(50);
                                                 jq(this).addClass('accepted');
                                         } else {
-                                                jq(this).html( bp_terms_rejected ).fadeIn(50);
+                                                jq(this).html( BP_DTheme.rejected ).fadeIn(50);
                                                 jq(this).addClass('rejected');
                                         }
@@ -820 +820 @@
         /** Alternate Highlighting ******************************************/
 
-        jq('table tr, div.message-box, ul#topic-post-list li').each( function(i) {
-                if ( i % 2 != 1 )
+        jq('body#bp-default table.zebra tbody tr').mouseover( function() {
+                jq(this).addClass('over');
+        }).mouseout( function() {
+                jq(this).removeClass('over');
+        });
+
+        jq('body#bp-default table.zebra tbody tr:odd').addClass('alt');
+
+        jq('div.message-box').each( function(i) {
+                if ( i % 2 == 1 )
                         jq(this).addClass('alt');
         });
@@ -957 +965 @@
 
         /* Bulk delete messages */
-        jq("a#delete_inbox_messages").click( function() {
+        jq("a#delete_inbox_messages, a#delete_sentbox_messages").click( function() {
                 checkboxes_tosend = '';
                 checkboxes = jq("#message-threads tr td input[type='checkbox']");
@@ -990 +998 @@
 
                         jq('div#message').hide().slideDown(150);
-                        jq("a#delete_inbox_messages").removeClass('loading');
+                        jq("a#delete_inbox_messages, a#delete_sentbox_messages").removeClass('loading');
                 });
                 return false;
@@ -1078 +1086 @@
                 return false;
 
-        if ( jq.query.get('s') )
+        if ( jq.query.get('s') && !search_terms )
                 search_terms = jq.query.get('s');
 
@@ -1159 +1167 @@
                         jq(this).html(response.contents);
                         jq(this).fadeIn(100);
+
+                        /* Selectively hide comments */
+                        bp_dtheme_hide_comments();
                 });
 
@@ -1166 +1177 @@
 
                 jq('div.item-list-tabs li.selected').removeClass('loading');
-
-                /* Selectively hide comments */
-                bp_dtheme_hide_comments();
 
         }, 'json' );
@@ -1198 +1206 @@
 
                                 if ( !i )
-                                        jq(this).before( '<li class="show-all"><a href="#' + parent_li.attr('id') + '/show-all/" title="' + bp_terms_show_all_comments + '">' + bp_terms_show_all + ' ' + comment_count + ' ' + bp_terms_comments + '</a></li>' );
+                                        jq(this).before( '<li class="show-all"><a href="#' + parent_li.attr('id') + '/show-all/" title="' + BP_DTheme.show_all_comments + '">' + BP_DTheme.show_all + ' ' + comment_count + ' ' + BP_DTheme.comments + '</a></li>' );
                         }
                 });

trunk/bp-themes/bp-default/blogs/create.php

@@ -1 +1 @@
 <?php get_header() ?>
 
-        <?php do_action( 'bp_before_directory_blogs_content' ) ?>
+        <?php do_action( 'bp_before_directory_groups_content' ) ?>
 
         <div id="content">
@@ -31 +31 @@
         <?php locate_template( array( 'sidebar.php' ), true ) ?>
 
-        <?php do_action( 'bp_after_directory_blogs_content' ) ?>
+        <?php do_action( 'bp_after_directory_groups_content' ) ?>
 
 <?php get_footer() ?>

trunk/bp-themes/bp-default/comments.php

@@ -20 +20 @@
 
                         <span class="title"><?php the_title() ?></span>
-                        <h3 id="comments"><?php comments_number( '', '', $numComments );?></h3>
+                        <h3 id="comments"><?php comments_number( 'No Comments', 'One Comment', $numComments . ' Comments' );?></h3>
 
                         <?php do_action( 'bp_before_blog_comment_list' ) ?>

trunk/bp-themes/bp-default/forums/forums-loop.php

@@ +1 @@
+<?php /* Querystring is set via AJAX in _inc/ajax.php - bp_dtheme_object_filter() */ ?>
+
+<?php do_action( 'bp_before_forums_loop' ) ?>
+
 <?php if ( bp_has_forum_topics( bp_ajax_querystring( 'forums' ) ) ) : ?>
 
-        <div class="pagination">
+        <div id="pag-top" class="pagination">
 
-                <div id="post-count" class="pag-count">
-                        <?php if ( bp_is_group_forum() && is_user_logged_in() ) : ?>
-                                <a href="#post-new" class="button"><?php _e( 'New Topic', 'buddypress' ) ?></a> &nbsp;
-                        <?php endif; ?>
-
+                <div class="pag-count" id="topic-count-top">
                         <?php bp_forum_pagination_count() ?>
                 </div>
 
-                <div class="pagination-links" id="topic-pag">
+                <div class="pagination-links" id="topic-pag-top">
                         <?php bp_forum_pagination() ?>
                 </div>
@@ -19 +19 @@
         <?php do_action( 'bp_before_directory_forums_list' ) ?>
 
-        <table class="forum">
+        <table class="forum zebra">
+                <thead>
+                        <tr>
+                                <th id="th-title"><?php _e( 'Topic Title', 'buddypress' ) ?></th>
+                                <th id="th-poster"><?php _e( 'Latest Poster', 'buddypress' ) ?></th>
 
-                <tr>
-                        <th id="th-title"><?php _e( 'Topic Title', 'buddypress' ) ?></th>
-                        <th id="th-poster"><?php _e( 'Latest Poster', 'buddypress' ) ?></th>
+                                <?php if ( !bp_is_group_forum() ) : ?>
+                                        <th id="th-group"><?php _e( 'Posted In Group', 'buddypress' ) ?></th>
+                                <?php endif; ?>
 
-                        <?php if ( !bp_is_group_forum() ) : ?>
-                                <th id="th-group"><?php _e( 'Posted In Group', 'buddypress' ) ?></th>
-                        <?php endif; ?>
+                                <th id="th-postcount"><?php _e( 'Posts', 'buddypress' ) ?></th>
+                                <th id="th-freshness"><?php _e( 'Freshness', 'buddypress' ) ?></th>
 
-                        <th id="th-postcount"><?php _e( 'Posts', 'buddypress' ) ?></th>
-                        <th id="th-freshness"><?php _e( 'Freshness', 'buddypress' ) ?></th>
+                                <?php do_action( 'bp_directory_forums_extra_cell_head' ) ?>
 
-                        <?php do_action( 'bp_directory_forums_extra_cell_head' ) ?>
+                        </tr>
+                </thead>
 
-                </tr>
+                <tbody>
 
-                <?php while ( bp_forum_topics() ) : bp_the_forum_topic(); ?>
+                        <?php while ( bp_forum_topics() ) : bp_the_forum_topic(); ?>
 
-                <tr class="<?php bp_the_topic_css_class() ?>">
-                        <td class="td-title">
-                                <a class="topic-title" href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>">
-                                        <?php bp_the_topic_title() ?>
-                                </a>
-                        </td>
-                        <td class="td-poster">
-                                <a href="<?php bp_the_topic_permalink() ?>"><?php bp_the_topic_last_poster_avatar( 'type=thumb&width=20&height=20' ) ?></a>
-                                <div class="poster-name"><?php bp_the_topic_last_poster_name() ?></div>
-                        </td>
+                        <tr class="<?php bp_the_topic_css_class() ?>">
+                                <td class="td-title">
+                                        <a class="topic-title" href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>">
+                                                <?php bp_the_topic_title() ?>
+                                        </a>
+                                </td>
+                                <td class="td-poster">
+                                        <a href="<?php bp_the_topic_permalink() ?>"><?php bp_the_topic_last_poster_avatar( 'type=thumb&width=20&height=20' ) ?></a>
+                                        <div class="poster-name"><?php bp_the_topic_last_poster_name() ?></div>
+                                </td>
 
-                        <?php if ( !bp_is_group_forum() ) : ?>
-                                <td class="td-group">
-                                        <a href="<?php bp_the_topic_object_permalink() ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ) ?></a>
-                                        <div class="object-name"><a href="<?php bp_the_topic_object_permalink() ?>" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name() ?></a></div>
+                                <?php if ( !bp_is_group_forum() ) : ?>
+                                        <td class="td-group">
+                                                <a href="<?php bp_the_topic_object_permalink() ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ) ?></a>
+                                                <div class="object-name"><a href="<?php bp_the_topic_object_permalink() ?>" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name() ?></a></div>
+                                        </td>
+                                <?php endif; ?>
+
+                                <td class="td-postcount">
+                                        <?php bp_the_topic_total_posts() ?>
                                 </td>
-                        <?php endif; ?>
+                                <td class="td-freshness">
+                                        <?php bp_the_topic_time_since_last_post() ?>
+                                </td>
 
-                        <td class="td-postcount">
-                                <?php bp_the_topic_total_posts() ?>
-                        </td>
-                        <td class="td-freshness">
-                                <?php bp_the_topic_time_since_last_post() ?>
-                        </td>
+                                <?php do_action( 'bp_directory_forums_extra_cell' ) ?>
+                        </tr>
 
-                        <?php do_action( 'bp_directory_forums_extra_cell' ) ?>
-                </tr>
+                        <?php do_action( 'bp_directory_forums_extra_row' ) ?>
 
-                <?php do_action( 'bp_directory_forums_extra_row' ) ?>
+                        <?php endwhile; ?>
 
-                <?php endwhile; ?>
-
+                </tbody>
         </table>
 
         <?php do_action( 'bp_after_directory_forums_list' ) ?>
+
+        <div id="pag-bottom" class="pagination">
+
+                <div class="pag-count" id="topic-count-bottom">
+                        <?php bp_forum_pagination_count() ?>
+                </div>
+
+                <div class="pagination-links" id="topic-pag-bottom">
+                        <?php bp_forum_pagination() ?>
+                </div>
+
+        </div>
 
 <?php else: ?>
@@ -81 +97 @@
 
 <?php endif;?>
+
+<?php do_action( 'bp_after_forums_loop' ) ?>

trunk/bp-themes/bp-default/forums/index.php

@@ -1 +1 @@
 <?php get_header() ?>
+
+        <?php do_action( 'bp_before_directory_forums_content' ) ?>
 
         <div id="content">
@@ -5 +7 @@
 
                 <form action="" method="post" id="forums-search-form" class="dir-form">
-
                         <h3><?php _e( 'Group Forums Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() ) : ?> &nbsp;<a class="button" href="#new-topic" id="new-topic-button"><?php _e( 'New Topic', 'buddypress' ) ?></a><?php endif; ?></h3>
-
-                        <?php do_action( 'bp_before_directory_forums_content' ) ?>
 
                         <div id="forums-dir-search" class="dir-search">

trunk/bp-themes/bp-default/functions.php

@@ -72 +72 @@
 /* Filter the dropdown for selecting the page to show on front to include "Activity Stream" */
 function bp_dtheme_wp_pages_filter( $page_html ) {
-        if ( !bp_is_active( 'activity' ) )
-                return $page_html;
-
         if ( 'page_on_front' != substr( $page_html, 14, 13 ) )
                 return $page_html;

trunk/bp-themes/bp-default/groups/index.php

@@ -15 +15 @@
                         <div class="item-list-tabs">
                                 <ul>
-                                        <li class="selected" id="groups-all"><a href="<?php echo bp_get_root_domain() . '/' . BP_GROUPS_SLUG ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() ) ?></a></li>
+                                        <li class="selected" id="groups-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() ) ?></a></li>
 
                                         <?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>

trunk/bp-themes/bp-default/members/single/home.php

@@ -15 +15 @@
                                                 <?php bp_get_displayed_user_nav() ?>
 
-                                                <?php do_action( 'bp_member_options_nav' ) ?>
+                                                <?php do_action( 'bp_members_directory_member_types' ) ?>
                                         </ul>
                                 </div>

trunk/bp-themes/bp-default/members/single/profile/edit.php

@@ -48 +48 @@
                                                 <?php bp_the_profile_field_options() ?>
                                         </select>
-
-                                        <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
-                                                <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
-                                        <?php endif; ?>
 
                                 <?php endif; ?>

trunk/bp-themes/bp-default/sidebar.php

@@ -38 +38 @@
                 </p>
 
-                <form name="login-form" id="sidebar-login-form" class="standard-form" action="<?php echo site_url( 'wp-login.php', 'login_post' ) ?>" method="post">
+                <form name="login-form" id="sidebar-login-form" class="standard-form" action="<?php echo site_url( 'wp-login.php', 'login' ) ?>" method="post">
                         <label><?php _e( 'Username', 'buddypress' ) ?><br />
                         <input type="text" name="log" id="sidebar-user-login" class="input" value="<?php echo attribute_escape(stripslashes($user_login)); ?>" /></label>

trunk/bp-xprofile.php

@@ -16 +16 @@
  * @uses site_url() Returns the site URL
  */
+
 function xprofile_setup_globals() {
         global $bp, $wpdb;
@@ -136 +137 @@
                         <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/change-avatar/"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
 <?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
-
                         <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Mark as Spammer", 'buddypress' ) ?></a></li>
 <?php else : ?>
@@ -235 +235 @@
                 }
 
-                if ( !empty( $errors ) )
+                if ( $errors )
                         bp_core_add_message( __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' ), 'error' );
                 else {
@@ -249 +249 @@
                         }
 
-                        do_action( 'xprofile_updated_profile', $bp->displayed_user->id, $posted_field_ids, $errors );
+                        do_action( 'xprofile_updated_profile', $posted_field_ids, $errors );
 
                         /* Set the feedback messages */
@@ -642 +642 @@
                 return false;
 
-        /* If the value is empty, then delete any field data that exists */
-        if ( empty( $value ) ) {
-                xprofile_delete_field_data( $field_id, $user_id );
-                return true;
-        }
-
         $field = new BP_XProfile_Field( $field_id );
 
@@ -693 +687 @@
                 $field_id = xprofile_get_field_id_from_name( $field );
 
-        if ( empty( $field_id ) || empty( $user_id ) )
-                return false;
-
-        $field = new BP_XProfile_ProfileData( $field_id, $user_id );
+        if ( !$field_id )
+                return false;
+
+        $field = new BP_XProfile_ProfileData( $field_id );
         return $field->delete();
 }
@@ -882 +876 @@
         BP_XProfile_ProfileData::delete_data_for_user( $user_id );
 
-        /* delete any avatar files. */
-        @unlink( get_usermeta( $user_id, 'bp_core_avatar_v1_path' ) );
-        @unlink( get_usermeta( $user_id, 'bp_core_avatar_v2_path' ) );
-
-        /* unset the usermeta for avatars from the usermeta table. */
-        delete_usermeta( $user_id, 'bp_core_avatar_v1' );
-        delete_usermeta( $user_id, 'bp_core_avatar_v1_path' );
-        delete_usermeta( $user_id, 'bp_core_avatar_v2' );
-        delete_usermeta( $user_id, 'bp_core_avatar_v2_path' );
+        // delete any avatar files.
+        @unlink( get_user_meta( $user_id, 'bp_core_avatar_v1_path', true ) );
+        @unlink( get_user_meta( $user_id, 'bp_core_avatar_v2_path', true ) );
+
+        // unset the usermeta for avatars from the usermeta table.
+        delete_user_meta( $user_id, 'bp_core_avatar_v1' );
+        delete_user_meta( $user_id, 'bp_core_avatar_v1_path' );
+        delete_user_meta( $user_id, 'bp_core_avatar_v2' );
+        delete_user_meta( $user_id, 'bp_core_avatar_v2_path' );
 }
 add_action( 'wpmu_delete_user', 'xprofile_remove_data' );

trunk/bp-xprofile/admin/css/admin.css

@@ -141 +141 @@
                         margin: 0 0 1em 0;
                 }
-        
+
                         ul.forTab li label {
                                 display: block;
                         }
-        
+
                         ul.forTab li input {
                                 font-size: 1.4em;
                         }
-        
+
         p.success { background: green;}
-        p.err { 
+        p.err {
                 border-top: 2px solid red;
                 border-bottom: 2px solid red;
@@ -158 +158 @@
                 width: 40%;
         }
-        
+
         span.desc, span.signup-description {
                 display: block;

trunk/bp-xprofile/bp-xprofile-admin.php

@@ -121 +121 @@
                                         } /* End For */ ?>
                                 </div>
-<?php 
+<?php
                                 else :
 ?>
@@ -330 +330 @@
 function xprofile_admin_field( $admin_field, $admin_group ) {
         global $field;
-        
+
         $field = $admin_field;
 ?>

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

@@ -549 +549 @@
                                                    <input type="text" name="<?php echo $type; ?>_option[<?php echo $j; ?>]" id="<?php echo $type; ?>_option<?php echo $j; ?>" value="<?php echo attribute_escape( $options[$i]->name ); ?>" />
                                                    <input type="<?php echo $default_input; ?>" name="isDefault_<?php echo $type; ?>_option<?php echo $default_name; ?>" <?php if ( (int) $options[$i]->is_default_option ) {?> checked="checked"<?php } ?> " value="<?php echo $j; ?>" /> <?php _e( 'Default Value', 'buddypress' ); ?>
-<?php 
+<?php
                                         if ( $j != 1 && $options[$i]->id != -1 ) : ?>
                                                         <a href="admin.php?page=bp-profile-setup&amp;mode=delete_option&amp;option_id=<?php echo $options[$i]->id ?>" class="ajax-option-delete" id="delete-<?php echo $options[$i]->id; ?>">[x]</a>

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

@@ -343 +343 @@
                 global $field;
 
-                $array_box = false;
-                if ( 'multiselectbox' == $field->type )
-                        $array_box = '[]';
-
-                return apply_filters( 'bp_get_the_profile_field_input_name', 'field_' . $field->id . $array_box );
+                return apply_filters( 'bp_get_the_profile_field_input_name', 'field_' . $field->id );
         }
 
@@ -375 +371 @@
 
                                 for ( $k = 0; $k < count($options); $k++ ) {
-                                        $option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id ) );
-                                        $option_values = (array)$option_values;
+                                        $option_value = BP_XProfile_ProfileData::get_value_byid($options[$k]->parent_id);
 
                                         /* Check for updated posted values, but errors preventing them from being saved first time */
-                                        foreach( (array)$option_values as $i => $option_value ) {
-                                                if ( isset( $_POST['field_' . $field->id] ) && $_POST['field_' . $field->id] != $option_value ) {
-                                                        if ( !empty( $_POST['field_' . $field->id] ) )
-                                                                $option_values[$i] = $_POST['field_' . $field->id];
-                                                }
+                                        if ( isset( $_POST['field_' . $field->id] ) && $option_value != $_POST['field_' . $field->id] ) {
+                                                if ( !empty( $_POST['field_' . $field->id] ) )
+                                                        $option_value = $_POST['field_' . $field->id];
                                         }
 

trunk/readme.txt

@@ -1 +1 @@
 === Plugin Name ===
-Contributors: apeatling
+Contributors: apeatling, johnjamesjacoby, mrmaz
 Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, mingle, social, community, networks, networking, cms
-Requires at least: 2.9.1
-Tested up to: 2.9.2
-Stable tag: 1.2.3
+Requires at least: 3.0
+Tested up to: 3.0.1
+Stable tag: 1.2.5.2
 
 == Description ==
@@ -124 +124 @@
 == Upgrade Notice ==
 
-= 1.2.2.1 =
-Fixes a bug where new account activation emails would not be sent correctly. Important upgrade.
+= 1.2.5.1 =
+Fixes 'Mark user as spam' and 'Delete user' issues. Important upgrade.
 
 == Changelog ==