Changeset 2209

Timestamp:

12/27/2009 10:41:10 AM (16 years ago)

Author:

apeatling

Message:

Single WP support. Yes, you read that correctly.

Location:

trunk

Files:

• bp-blogs.php (modified) (9 diffs)
• bp-core.php (modified) (7 diffs)
• bp-core/bp-core-activation.php (modified) (1 diff)
• bp-core/bp-core-adminbar.php (modified) (5 diffs)
• bp-core/bp-core-avatars.php (modified) (6 diffs)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• 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) (7 diffs)
• bp-core/bp-core-templatetags.php (modified) (5 diffs)
• bp-core/bp-core-wpabstraction.php (added)
• bp-forums/bb-config.php (modified) (1 diff)
• bp-forums/bp-forums-admin.php (modified) (1 diff)
• bp-forums/bp-forums-bbpress.php (modified) (1 diff)
• bp-forums/bp-forums-templatetags.php (modified) (1 diff)
• bp-friends.php (modified) (1 diff)
• bp-groups.php (modified) (1 diff)
• 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) (3 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (2 diffs)
• bp-themes/bp-default/activity/index.php (modified) (1 diff)
• bp-themes/bp-default/footer.php (modified) (1 diff)
• bp-themes/bp-default/header.php (modified) (1 diff)
• bp-themes/bp-default/registration/register.php (modified) (4 diffs)
• bp-themes/bp-default/sidebar.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)

trunk/bp-blogs.php

@@ -65 +65 @@
     // On first installation - record all existing blogs in the system.
     if ( !(int)get_site_option( 'bp-blogs-first-install') ) {
-
         bp_blogs_record_existing_blogs();
         add_site_option( 'bp-blogs-first-install', 1 );
-
-    } else {
-
-        // Import blog titles and descriptions into the blogmeta table
-        if ( get_site_option( 'bp-blogs-version' ) <= '0.1.5' ) {
-            $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM " . $bp->blogs->table_name ) );
-
-            for ( $i = 0; $i < count($blog_ids); $i++ ) {
-                $name = get_blog_option( $blog_ids[$i], 'blogname' );
-                $desc = get_blog_option( $blog_ids[$i], 'blogdescription' );
-
-                bp_blogs_update_blogmeta( $blog_ids[$i], 'name', $name );
-                bp_blogs_update_blogmeta( $blog_ids[$i], 'description', $desc );
-                bp_blogs_update_blogmeta( $blog_ids[$i], 'last_activity', time() );
-            }
-        }
-
     }
 
@@ -139 +121 @@
 function bp_blogs_setup_nav() {
     global $bp;
+
+    /* Blog/post/comment menus should not appear on single WordPress setups. Although comments
+       and posts made by users will still show on their activity stream .*/
+    if ( !bp_core_is_multiblog_install() )
+        return false;
 
     /* Add 'Blogs' to the main navigation */
@@ -171 +158 @@
     global $bp;
 
-    if ( $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
+    if ( bp_core_is_multiblog_install() && $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
         $bp->is_directory = true;
 
@@ -190 +177 @@
 
 function bp_blogs_screen_my_blogs() {
+    global $bp;
+
+    if ( !bp_core_is_multiblog_install() )
+        return false;
+
     do_action( 'bp_blogs_screen_my_blogs' );
     bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'members/single/home' ) );
@@ -207 +199 @@
     global $bp;
 
-    if ( $bp->current_component != $bp->blogs->slug || 'create' != $bp->current_action )
+    if ( !bp_core_is_multiblog_install() || $bp->current_component != $bp->blogs->slug || 'create' != $bp->current_action )
         return false;
 
@@ -379 +371 @@
             bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
 
-            if ( (int)get_blog_option( $blog_id, 'blog_public' ) ) {
+            if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
                 /* Record this in activity streams */
                 $post_permalink = bp_post_get_permalink( $post, $blog_id );
@@ -415 +407 @@
         }
 
-        if ( (int)get_blog_option( $blog_id, 'blog_public' ) ) {
+        if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
             /* Now re-record the post in the activity streams */
             $post_permalink = bp_post_get_permalink( $post, $blog_id );
@@ -469 +461 @@
     bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', time() );
 
-    if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) ) {
+    if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
         /* Record in activity streams */
         $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
@@ -503 +495 @@
     bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
 
-    if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) ) {
+    if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
         /* Record in activity streams */
         $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );

trunk/bp-core.php

@@ -11 +11 @@
 define( 'BP_PLUGIN_DIR', WP_PLUGIN_DIR . '/buddypress' );
 define( 'BP_PLUGIN_URL', plugins_url( $path = '/buddypress' ) );
+
+/* Load the WP abstraction file so BuddyPress can run on all WordPress setups. */
+require ( BP_PLUGIN_DIR . '/bp-core/bp-core-wpabstraction.php' );
 
 /* Place your custom code (actions/filters) in a file called /plugins/bp-custom.php and it will be loaded before anything else. */
@@ -63 +66 @@
     define( 'BP_HOME_BLOG_SLUG', 'blog' );
 
-/* Register BuddyPress themes contained within the theme folder */
-if ( function_exists( 'register_theme_folder' ) )
-    register_theme_folder( 'buddypress/bp-themes' );
+/* Register BuddyPress themes contained within the bp-theme folder */
+if ( function_exists( 'register_theme_directory') )
+    register_theme_directory( WP_PLUGIN_DIR . '/buddypress/bp-themes' );
 
 
@@ -414 +417 @@
  */
 function bp_core_action_set_spammer_status() {
-    global $bp;
+    global $bp, $wpdb;
 
     if ( !is_site_admin() || bp_is_home() || !$bp->displayed_user->id )
@@ -424 +427 @@
 
         /* Get the functions file */
-        require( ABSPATH . 'wp-admin/includes/mu.php' );
+        if ( file_exists( ABSPATH . 'wp-admin/includes/mu.php' ) && bp_core_is_multiblog_install() )
+            require( ABSPATH . 'wp-admin/includes/mu.php' );
 
         if ( 'mark-spammer' == $bp->current_action )
@@ -447 +451 @@
 
         /* Finally, mark this user as a spammer */
-        update_user_status( $bp->displayed_user->id, 'spam', $is_spam, 1 );
+        if ( bp_core_is_multiblog_install() )
+            $wpdb->update( $wpdb->users, array( 'spam' => $is_spam ), array( 'ID' => $bp->displayed_user->id ) );
+
+        $wpdb->update( $wpdb->users, array( 'user_status' => $is_spam ), array( 'ID' => $bp->displayed_user->id ) );
 
         if ( $is_spam )
@@ -1169 +1176 @@
  */
 function bp_core_get_total_member_count() {
-    global $wpdb;
-
-    $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0" ) );
+    global $wpdb, $bp;
+
+    $status_sql = bp_core_get_status_sql();
+
+    $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM " . CUSTOM_USER_TABLE . " WHERE {$status_sql}" ) );
     return apply_filters( 'bp_core_get_total_member_count', $count );
 }
@@ -1187 +1196 @@
     global $wpdb;
 
-    return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) ) );
+    if ( bp_core_is_multiblog_install() )
+        $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) );
+    else
+        $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT user_status FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) );
+
+    return apply_filters( 'bp_core_is_user_spammer', $is_spammer );
 }
 

trunk/bp-core/bp-core-activation.php

@@ -4 +4 @@
     global $bp, $wpdb;
 
-    if ( BP_ACTIVATION_SLUG != $bp->current_component )
-        return false;
-
-    /* If we are using a BuddyPress 1.0 theme ignore this. */
-    if ( file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
+    if ( !bp_core_is_multiblog_install() || BP_ACTIVATION_SLUG != $bp->current_component )
         return false;
 

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

@@ -2 +2 @@
 
 function bp_core_admin_bar() {
-    global $bp, $wpdb, $current_blog, $doing_admin_bar;
+    global $bp, $wpdb, $current_blog;
 
     if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
         return false;
-
-    $doing_admin_bar = true;
 
     if ( (int)get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() )
@@ -43 +41 @@
 
     // Show "Sign Up" link if user registrations are allowed
-    if ( get_site_option( 'registration' ) != 'none' && get_site_option( 'registration' ) != 'blog' ) {
-        echo '<li class="bp-signup no-arrow"><a href="' . bp_signup_page(false) . '">' . __( 'Sign Up', 'buddypress' ) . '</a></li>';
+    if ( bp_get_signup_allowed() ) {
+        echo '<li class="bp-signup no-arrow"><a href="' . bp_get_signup_page(false) . '">' . __( 'Sign Up', 'buddypress' ) . '</a></li>';
     }
 }
@@ -251 +249 @@
             <?php endif; ?>
 
-            <?php if ( function_exists('bp_blogs_install') ) : ?>
+            <?php if ( function_exists('bp_blogs_install') && bp_core_is_multiblog_install() ) : ?>
             <li><a href="<?php echo $bp->root_domain . '/' . $bp->blogs->slug . '/?random-blog' ?>"><?php _e( 'Random Blog', 'buddypress' ) ?></a></li>
 
@@ -260 +258 @@
     </li>
     <?php
-
-    $doing_admin_bar = false;
 }
 
@@ -267 +263 @@
 add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu', 2 );
 add_action( 'bp_adminbar_menus', 'bp_adminbar_account_menu', 4 );
-add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu', 6 );
+
+if ( bp_core_is_multiblog_install() )
+    add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu', 6 );
+
 add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
-add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
+
+if ( bp_core_is_multiblog_install() )
+    add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
+
 add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu', 100 );
 

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

@@ -9 +9 @@
  */
 
+if ( !defined( 'BP_AVATAR_UPLOAD_PATH' ) )
+    define( 'BP_AVATAR_UPLOAD_PATH', bp_core_avatar_upload_path() );
+
 if ( !defined( 'BP_AVATAR_THUMB_WIDTH' ) )
     define( 'BP_AVATAR_THUMB_WIDTH', 50 );
@@ -24 +27 @@
     define( 'BP_AVATAR_ORIGINAL_MAX_WIDTH', 450 );
 
-if ( !defined( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE' ) )
-    define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', get_site_option( 'fileupload_maxk' ) * 1024 );
+if ( !defined( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE' ) ) {
+    if ( !get_site_option( 'fileupload_maxk' ) )
+        define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', 5120000 ); /* 5mb */
+    else
+        define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', get_site_option( 'fileupload_maxk' ) * 1024 );
+}
 
 if ( !defined( 'BP_AVATAR_DEFAULT' ) )
@@ -95 +102 @@
         $html_height = ( 'thumb' == $type ) ? ' height="' . BP_AVATAR_THUMB_HEIGHT . '"' : ' height="' . BP_AVATAR_FULL_HEIGHT . '"';
 
-    $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', $bp->root_domain . '/' . basename( WP_CONTENT_DIR ) . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
-    $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
+    $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, BP_AVATAR_UPLOAD_PATH ) . '/' . $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 );
 
     /****
@@ -188 +195 @@
     }
 
-    if ( 'user' == $object ) {
-        /* Delete any legacy meta entries if this is a user avatar */
-        delete_usermeta( $item_id, 'bp_core_avatar_v1_path' );
-        delete_usermeta( $item_id, 'bp_core_avatar_v1' );
-        delete_usermeta( $item_id, 'bp_core_avatar_v2_path' );
-        delete_usermeta( $item_id, 'bp_core_avatar_v2' );
-    }
-
-    $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
+    $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', BP_AVATAR_UPLOAD_PATH . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
 
     if ( !file_exists( $avatar_folder_dir ) )
@@ -304 +303 @@
         $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . dirname( $original_file ), $item_id, $object, $avatar_dir );
     else
-        $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
+        $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', BP_AVATAR_UPLOAD_PATH . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
 
     if ( !file_exists( $avatar_folder_dir ) )
@@ -368 +367 @@
 }
 
+function bp_core_avatar_upload_path() {
+    if ( bp_core_is_multiblog_install() )
+        $path = ABSPATH . get_blog_option( BP_ROOT_BLOG, 'upload_path' );
+    else
+        $path = get_option( 'upload_path' );
+
+    return apply_filters( 'bp_core_avatar_upload_path', $path );
+}
+
 ?>

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

@@ -33 +33 @@
     global $bp, $current_blog;
 
-    if ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
+    if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && bp_core_is_multiblog_install() ) {
         /* Only catch URI's on the root blog if we are not running BP on multiple blogs */
         if ( BP_ROOT_BLOG != (int) $current_blog->blog_id )

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

@@ -128 +128 @@
             $sql['join_profiledata'] = "LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id";
 
-        $sql['where'] = "WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0";
+        $sql['where'] = 'WHERE ' . bp_core_get_status_sql( 'u.' );
 
         if ( 'active' == $type || 'online' == $type )
@@ -223 +223 @@
 
         $letter = like_escape( $wpdb->escape( $letter ) );
-
-        $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT u.ID) FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter );
-        $paged_users_sql = apply_filters( 'bp_core_users_by_letter_sql', $wpdb->prepare( "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter, $pag_sql );
+        $status_sql = bp_core_get_status_sql( 'u.' );
+
+        $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT u.ID) FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter );
+        $paged_users_sql = apply_filters( 'bp_core_users_by_letter_sql', $wpdb->prepare( "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter, $pag_sql );
 
         $total_users = $wpdb->get_var( $total_users_sql );
@@ -252 +253 @@
 
         $user_sql = " AND user_id IN ( " . $wpdb->escape( $user_ids ) . " ) ";
-
-        $total_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT ID) FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0 AND deleted = 0 AND user_status = 0 AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) " ), $wpdb->escape( $user_ids ) );
-        $paged_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT DISTINCT ID as id, user_registered, user_nicename, user_login, user_email FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0 AND deleted = 0 AND user_status = 0 AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) {$pag_sql}" ), $wpdb->escape( $user_ids ) );
+        $status_sql = bp_core_get_status_sql( 'u.' );
+
+        $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 );
@@ -277 +279 @@
 
         $search_terms = like_escape( $wpdb->escape( $search_terms ) );
-
-        $total_users_sql = apply_filters( 'bp_core_search_users_count_sql', "SELECT COUNT(DISTINCT u.ID) as id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC", $search_terms );
-        $paged_users_sql = apply_filters( 'bp_core_search_users_sql', "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC{$pag_sql}", $search_terms, $pag_sql );
+        $status_sql = bp_core_get_status_sql( 'u.' );
+
+        $total_users_sql = apply_filters( 'bp_core_search_users_count_sql', "SELECT COUNT(DISTINCT u.ID) as id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE {$status_sql} AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC", $search_terms );
+        $paged_users_sql = apply_filters( 'bp_core_search_users_sql', "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE {$status_sql} AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC{$pag_sql}", $search_terms, $pag_sql );
 
         $total_users = $wpdb->get_var( $total_users_sql );

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

@@ -10 +10 @@
  */
 function bp_core_add_admin_bar_css() {
-    global $current_blog;
+    global $bp;
 
     if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
         return false;
 
-    /* Fetch the admin bar css from the active theme location */
-    if ( file_exists( WP_CONTENT_DIR . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'stylesheet' ) . '/_inc/css/adminbar.css' ) )
-        $admin_bar_css = WP_CONTENT_URL . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'stylesheet' ) . '/_inc/css/adminbar.css';
-    else if ( file_exists( WP_CONTENT_DIR . '/' . get_blog_option( BP_ROOT_BLOG, 'template' ) . '/_inc/css/adminbar.css' ) )
-        $admin_bar_css = WP_CONTENT_URL . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'template' ) . '/_inc/css/adminbar.css';
-    else
-        $admin_bar_css = BP_PLUGIN_URL . '/bp-core/css/admin-bar-fallback.css';
-
-    wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $admin_bar_css ) );
+    /* Check there is admin bar css in the currently active theme. If not fallback to the css in the plugin. */
+    if ( !locate_template( array( '_inc/css/adminbar.css' ), false ) )
+        wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', BP_PLUGIN_URL . '/bp-core/css/admin-bar-fallback.css' ) );
+    else {
+        if ( is_admin() )
+            wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', str_replace( ABSPATH, $bp->root_domain . '/', locate_template( array( '_inc/css/adminbar.css' ), false ) ) ) );
+    }
 }
-add_action( 'admin_menu', 'bp_core_add_admin_bar_css' );
-add_action( 'template_redirect', 'bp_core_add_admin_bar_css' );
+add_action( 'init', 'bp_core_add_admin_bar_css' );
 
 /**
@@ -39 +36 @@
     wp_enqueue_script( 'bp-admin-bar-js', BP_PLUGIN_URL . '/bp-core/js/admin-bar.js', array( 'jquery' ) );
 }
-add_action( 'admin_menu', 'bp_core_add_admin_bar_js' );
-add_action( 'wp', 'bp_core_add_admin_bar_js' );
+add_action( 'init', 'bp_core_add_admin_bar_js' );
 
 /**

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

@@ -19 +19 @@
 
     /* If signups are disabled, just re-direct */
-    if ( 'none' == bp_get_signup_allowed() || 'blog' == bp_get_signup_allowed() )
+    if ( !bp_get_signup_allowed() || 'none' == bp_get_signup_allowed() || 'blog' == bp_get_signup_allowed() )
         bp_core_redirect( $bp->root_domain );
 
@@ -33 +33 @@
 
         /* Check the base account details for problems */
-        $account_details = wpmu_validate_user_signup( $_POST['signup_username'] , $_POST['signup_email'] );
+        $account_details = wpmu_validate_user_signup( $_POST['signup_username'], $_POST['signup_email'] );
 
         /* If there are errors with account details, set them for display */
@@ -49 +49 @@
         if ( ( !empty( $_POST['signup_password'] ) && !empty( $_POST['signup_password_confirm'] ) ) && $_POST['signup_password'] != $_POST['signup_password_confirm'] )
             $bp->signup->errors['signup_password'] = __( 'The passwords you entered do not match.', 'buddypress' );
+
+        $bp->signup->username = $_POST['signup_username'];
+        $bp->signup->email = $_POST['signup_email'];
 
         /* Now we've checked account details, we can check profile information */
@@ -122 +125 @@
 
                 /* Finally, sign up the user and/or blog*/
-                if ( isset( $_POST['signup_with_blog'] ) )
+                if ( isset( $_POST['signup_with_blog'] ) && bp_core_is_multiblog_install() )
                     wpmu_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
-                else
-                    wpmu_signup_user( $_POST['signup_username'], $_POST['signup_email'], $usermeta );
+                else {
+                    bp_core_signup_user( $_POST['signup_username'], $_POST['signup_password'], $_POST['signup_email'], $usermeta );
+                }
 
                 $bp->signup->step = 'completed-confirmation';
@@ -145 +149 @@
         $bp->signup->step = 'completed-confirmation';
 
-        /* Get the activation key */
-        if ( !$bp->signup->key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $_POST[ 'signup_username' ], $_POST[ 'signup_email' ] ) ) ) {
-            bp_core_add_message( __( 'There was a problem uploading your avatar, please try uploading it again', 'buddypress' ) );
-        } else {
-            /* Hash the key to create the upload folder (added security so people don't sniff the activation key) */
-            $bp->signup->avatar_dir = wp_hash( $bp->signup->key );
-
-            /* Pass the file to the avatar upload handler */
-            if ( bp_core_avatar_handle_upload( $_FILES, 'bp_core_signup_avatar_upload_dir' ) ) {
-                $bp->avatar_admin->step = 'crop-image';
-
-                /* Make sure we include the jQuery jCrop file for image cropping */
-                add_action( 'wp', 'bp_core_add_jquery_cropper' );
-            }
+        if ( bp_core_is_multiblog_install() ) {
+            /* Get the activation key */
+            if ( !$bp->signup->key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $_POST[ 'signup_username' ], $_POST[ 'signup_email' ] ) ) ) {
+                bp_core_add_message( __( 'There was a problem uploading your avatar, please try uploading it again', 'buddypress' ) );
+            } else {
+                /* Hash the key to create the upload folder (added security so people don't sniff the activation key) */
+                $bp->signup->avatar_dir = wp_hash( $bp->signup->key );
+            }
+        } else
+            $bp->signup->avatar_dir = wp_hash( $bp->signup->username );
+
+        /* Pass the file to the avatar upload handler */
+        if ( bp_core_avatar_handle_upload( $_FILES, 'bp_core_signup_avatar_upload_dir' ) ) {
+            $bp->avatar_admin->step = 'crop-image';
+
+            /* Make sure we include the jQuery jCrop file for image cropping */
+            add_action( 'wp', 'bp_core_add_jquery_cropper' );
         }
     }
@@ -182 +189 @@
 add_action( 'wp', 'bp_core_screen_signup', 3 );
 
+function bp_core_signup_user( $user_login, $user_password, $user_email, $usermeta ) {
+    global $bp;
+
+    if ( bp_core_is_multiblog_install() )
+        return wpmu_signup_user( $user_login, $user_email, $usermeta );
+
+    $errors = new WP_Error();
+
+    $user_id = wp_create_user( $user_login, $user_password, $user_email );
+    if ( !$user_id ) {
+        $errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email')));
+        return $errors;
+    }
+
+    /* Set any profile data */
+    if ( function_exists( 'xprofile_set_field_data' ) ) {
+        if ( !empty( $usermeta['profile_field_ids'] ) ) {
+            $profile_field_ids = explode( ',', $usermeta['profile_field_ids'] );
+
+            foreach( $profile_field_ids as $field_id ) {
+                $current_field = $usermeta["field_{$field_id}"];
+
+                if ( !empty( $current_field ) )
+                    xprofile_set_field_data( $field_id, $user_id, $current_field );
+            }
+        }
+    }
+
+    wp_new_user_notification( $user_id, $user_pass );
+
+    $bp->signup->username = $user_login;
+
+    return $user_id;
+}
+
 function bp_core_signup_avatar_upload_dir() {
     global $bp;
@@ -188 +230 @@
         return false;
 
-    $path = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
-    $newdir = WP_CONTENT_DIR . str_replace( 'wp-content', '', $path );
-    $newdir .= '/avatars/signups/' . $bp->signup->avatar_dir;
-
-    $newbdir = $newdir;
-
-    if ( !file_exists( $newdir ) )
-        @wp_mkdir_p( $newdir );
-
-    $newurl = WP_CONTENT_URL . '/blogs.dir/' . BP_ROOT_BLOG . '/files/avatars/signups/' . $bp->signup->avatar_dir;
+    $path  = BP_AVATAR_UPLOAD_PATH . '/avatars/signups/' . $bp->signup->avatar_dir;
+    $newbdir = $path;
+
+    if ( !file_exists( $path ) )
+        @wp_mkdir_p( $path );
+
+    $newurl = str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, $path );
     $newburl = $newurl;
     $newsubdir = '/avatars/signups/' . $bp->signup->avatar_dir;
 
-    return apply_filters( 'bp_core_signup_avatar_upload_dir', array( 'path' => $newdir, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
+    return apply_filters( 'bp_core_signup_avatar_upload_dir', array( 'path' => $path, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
 }
 

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

@@ -1 +1 @@
 <?php
-
 /***
  * Members template loop that will allow you to loop all members or friends of a member
@@ -902 +901 @@
 
 function bp_has_custom_signup_page() {
-    if ( file_exists( WP_CONTENT_DIR . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'template') . '/register.php') )
-        return true;
-
-    if ( file_exists( WP_CONTENT_DIR . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'template') . '/registration/register.php') )
-        return true;
-
-    return false;
-}
-
-function bp_signup_page( $deprecated = true ) {
-    if ( !$deprecated )
-        return bp_get_signup_page();
-    else
-        echo bp_get_signup_page();
+    if ( locate_template( array( 'register.php' ), false ) || locate_template( array( '/registration/register.php' ), false ) )
+        return true;
+
+    return false;
+}
+
+function bp_signup_page() {
+    echo bp_get_signup_page();
 }
     function bp_get_signup_page() {
         global $bp;
 
-        if ( bp_has_custom_signup_page() ) {
-                return apply_filters( 'bp_get_signup_page', $bp->root_domain . '/' . BP_REGISTER_SLUG );
-        } else {
-                return apply_filters( 'bp_get_signup_page', $bp->root_domain . '/wp-signup.php' );
-        }
+        if ( bp_has_custom_signup_page() )
+            $page = $bp->root_domain . '/' . BP_REGISTER_SLUG;
+        else
+            $page = $bp->root_domain . '/wp-signup.php';
+
+        return apply_filters( 'bp_get_signup_page', $page );
     }
 
@@ -937 +931 @@
 }
 
-function bp_activation_page( $echo = true ) {
-    global $bp;
-
-    if ( bp_has_custom_activation_page() ) {
-        if ( $echo )
-            echo $bp->root_domain . '/' . BP_ACTIVATION_SLUG;
+function bp_activation_page() {
+    echo bp_get_activation_page();
+}
+    function bp_get_activation_page() {
+        global $bp;
+
+        if ( bp_has_custom_activation_page() )
+            $page = $bp->root_domain . '/' . BP_ACTIVATION_SLUG;
         else
-            return $bp->root_domain . '/' . BP_ACTIVATION_SLUG;
-    } else {
-        if ( $echo )
-            echo $bp->root_domain . '/wp-activate.php';
-        else
-            return $bp->root_domain . '/wp-activate.php';
-    }
-}
+            $page = $bp->root_domain . '/wp-activate.php';
+
+        return apply_filters( 'bp_get_activation_page', $page );
+    }
 
 function bp_search_form_action() {
@@ -1219 +1211 @@
 }
     function bp_get_signup_allowed() {
-        return get_site_option( 'registration' );
+        if ( bp_core_is_multiblog_install() )
+            return get_site_option( 'registration' );
+        else {
+            if ( (int)get_option( 'users_can_register') )
+                return 'user';
+        }
+
+        return false;
     }
 
@@ -1226 +1225 @@
 
     return $bp->activation_complete;
+}
+
+function bp_registration_needs_activation() {
+    return apply_filters( 'bp_registration_needs_activation', bp_core_is_multiblog_install() );
 }
 

trunk/bp-forums/bb-config.php

@@ -5 +5 @@
  * It is very important from a security standpoint that this file is not moved.
  * Your actual bb-config.php file will be installed in the root of your WordPress
- * installation once you set up the forums component in BuddyPress.
+ * installation once you have set up the forums component in BuddyPress.
  */
 

trunk/bp-forums/bp-forums-admin.php

@@ -158 +158 @@
     $file .= "\n\n" . '$bb->uri = "' . BP_PLUGIN_URL . '/bp-forums/bbpress/";';
     $file .= "\n" .   '$bb->name = "' . get_blog_option( BP_ROOT_BLOG, 'name' ) . ' ' . __( 'Forums', 'buddypress' ) . '";';
-    $file .= "\n" .   '$bb->wordpress_mu_primary_blog_id = ' . BP_ROOT_BLOG . ';';
-    $file .= "\n\n" . 'define(\'BB_AUTH_SALT\', "' . AUTH_SALT . '");';
-    $file .= "\n" .   'define(\'BB_LOGGED_IN_SALT\', "' . LOGGED_IN_SALT . '");';
-    $file .= "\n" .   'define(\'BB_SECURE_AUTH_SALT\', "' . SECURE_AUTH_SALT . '");';
+
+    if ( bp_core_is_multiblog_install() )
+        $file .= "\n" .   '$bb->wordpress_mu_primary_blog_id = ' . BP_ROOT_BLOG . ';';
+
+    if ( defined( 'AUTH_SALT' ) )
+        $file .= "\n\n" . 'define(\'BB_AUTH_SALT\', "' . AUTH_SALT . '");';
+
+    if ( defined( 'LOGGED_IN_SALT' ) )
+        $file .= "\n" .   'define(\'BB_LOGGED_IN_SALT\', "' . LOGGED_IN_SALT . '");';
+
+    if ( defined( 'SECURE_AUTH_SALT' ) )
+        $file .= "\n" .   'define(\'BB_SECURE_AUTH_SALT\', "' . SECURE_AUTH_SALT . '");';
+
     $file .= "\n\n" . 'define(\'WP_AUTH_COOKIE_VERSION\', 2);';
     $file .= "\n\n" . '?>';

trunk/bp-forums/bp-forums-bbpress.php

@@ -95 +95 @@
         require_once( BB_PATH . 'bb-admin/includes/defaults.bb-schema.php' );
 
-        dbDelta( $bb_queries );
+        /* Backticks and "IF NOT EXISTS" break the dbDelta function. */
+        dbDelta( str_replace( ' IF NOT EXISTS', '', str_replace( '`', '', $bb_queries ) ) );
 
         require_once( BB_PATH . 'bb-admin/includes/functions.bb-upgrade.php' );

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

@@ -172 +172 @@
         if ( !$bp->groups->current_group->forum_id )
             return false;
+
+        $forum_id = $bp->groups->current_group->forum_id;
     }
 

trunk/bp-friends.php

@@ -481 +481 @@
         $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
 
-    return apply_filters( 'friends_get_total_friend_count', get_usermeta( $user_id, 'total_friend_count' ) );
+    $count = get_usermeta( $user_id, 'total_friend_count' );
+
+    if ( empty( $count ) )
+        $count = 0;
+
+    return apply_filters( 'friends_get_total_friend_count', $count );
 }
 

trunk/bp-groups.php

@@ -1959 +1959 @@
         $group_id = $bp->groups->current_group->id;
 
-    $path  = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
-    $newdir = WP_CONTENT_DIR . str_replace( 'wp-content', '', $path );
-    $newdir .= '/group-avatars/' . $group_id;
-
-    $newbdir = $newdir;
-
-    if ( !file_exists( $newdir ) )
-        @wp_mkdir_p( $newdir );
-
-    $newurl = WP_CONTENT_URL . '/blogs.dir/' . BP_ROOT_BLOG . '/files/group-avatars/' . $group_id;
+    $path = BP_AVATAR_UPLOAD_PATH . '/group-avatars/' . $group_id;
+    $newbdir = $path;
+
+    if ( !file_exists( $path ) )
+        @wp_mkdir_p( $path );
+
+    $newurl = str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, $path );
     $newburl = $newurl;
     $newsubdir = '/group-avatars/' . $group_id;
 
-    return apply_filters( 'groups_avatar_upload_dir', array( 'path' => $newdir, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
+    return apply_filters( 'groups_avatar_upload_dir', array( 'path' => $path, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
 }
 

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

@@ -44 +44 @@
     global $bp, $wpdb;
 
-    $users = $wpdb->get_results( $wpdb->prepare( "SELECT ID as user_id, user_email, user_login FROM {$wpdb->base_prefix}users WHERE user_status = 0 AND spam = 0 AND deleted = 0" ) );
+    $status_sql = bp_core_get_status_sql( 'u.' );
+    $users = $wpdb->get_results( $wpdb->prepare( "SELECT ID as user_id, user_email, user_login FROM {$wpdb->base_prefix}users WHERE {$status_sql}" ) );
 
     for ( $i = 0; $i < count($users); $i++ ) {

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

@@ -612 +612 @@
             return apply_filters( 'bp_get_the_thread_recipients', sprintf( __( '%d Recipients', 'buddypress' ), count($thread_template->thread->recipients) ) );
 
-        foreach( $thread_template->thread->recipients as $recipient )
+        foreach( (array)$thread_template->thread->recipients as $recipient )
             $recipient_links[] = bp_core_get_userlink( $recipient );
 
-        return apply_filters( 'bp_get_the_thread_recipients', implode( ', ', $recipient_links ) );
+        return apply_filters( 'bp_get_the_thread_recipients', implode( ', ', (array)$recipient_links ) );
     }
 

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

@@ -23 +23 @@
 h2 {
     margin: 10px 0;
-    font-size: 20px;
+    font-size: 22px;
+    font-weight: normal;
 }
 
 h3 {
-    font-size: 16px;
+    font-size: 18px;
     margin: 15px 0;
     color: #888;
+    font-weight: normal;
 }
 
@@ -571 +573 @@
 
 form.standard-form#signup_form div div.error {
-    color: white;
-    background: red;
+    color: #fff;
+    background: #e41717;
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
@@ -1432 +1434 @@
 
     div.post h3 {
-        font-size: 24px;
+        font-size: 26px;
         margin-bottom: 5px;
         line-height: 120%;

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

@@ -70 +70 @@
                 if ( 0 == j("ul.activity-list").length ) {
                     j("div.error").slideUp(100).remove();
-                    j("div.activity").append( '<ul id="site-wide-stream" class="activity-list item-list">' );
+                    j("div#message").slideUp(100).remove();
+                    j("div.activity").append( '<ul id="activity-stream" class="activity-list item-list">' );
                 }
 
@@ -366 +367 @@
             }
         }
-    });
-
-    /* New posts */
-    j("input#whats-new-submit").click( function() {
-        var button = j(this);
-        var form = button.parent().parent().parent().parent();
-
-        form.children().each( function() {
-            if ( j.nodeName(this, "textarea") || j.nodeName(this, "input") )
-                j(this).attr( 'disabled', 'disabled' );
-        });
-
-        j( 'form#' + form.attr('id') + ' span.ajax-loader' ).show();
-
-        /* Remove any errors */
-        j('div.error').remove();
-        button.attr('disabled','disabled');
-
-        j.post( ajaxurl, {
-            action: 'post_update',
-            'cookie': encodeURIComponent(document.cookie),
-            '_wpnonce_post_update': j("input#_wpnonce_post_update").val(),
-            'content': j("textarea#whats-new").val(),
-            'group': j("#whats-new-post-in").val()
-        },
-        function(response)
-        {
-            j( 'form#' + form.attr('id') + ' span.ajax-loader' ).hide();
-
-            form.children().each( function() {
-                if ( j.nodeName(this, "textarea") || j.nodeName(this, "input") )
-                    j(this).attr( 'disabled', '' );
-            });
-
-            /* Check for errors and append if found. */
-            if ( response[0] + response[1] == '-1' ) {
-                form.prepend( response.substr( 2, response.length ) );
-                j( 'form#' + form.attr('id') + ' div.error').hide().fadeIn( 200 );
-                button.attr("disabled", '');
-            } else {
-                if ( 0 == j("ul#activity-stream").length ) {
-                    j("div.error").slideUp(100).remove();
-                    j("div.activity").append( '<ul id="activity-stream" class="activity-list item-list">' );
-                }
-
-                j("ul#activity-stream").prepend(response);
-                j("li.new-update").hide().slideDown( 300 );
-                j("li.new-update").removeClass( 'new-update' );
-                j("textarea#whats-new").val('');
-
-                /* Re-enable the submit button after 8 seconds. */
-                setTimeout( function() { button.attr("disabled", ''); }, 8000 );
-            }
-        });
-
-        return false;
-    });
-
-    /**** Pagination Links ****************************************************/
-
-    j('div#content').click( function(event) {
-        var target = j(event.target);
-
-        if ( target.parent().parent().hasClass('pagination') ) {
-            if ( j('div.item-list-tabs li.selected').length )
-                var el = j('div.item-list-tabs li.selected');
-            else
-                var el = j('li.filter select');
-
-            var page_number = 1;
-            var css_id = el.attr('id').split( '-' );
-            var object = css_id[0];
-
-            if ( j(target).hasClass('next') )
-                var page_number = Number( j('div.pagination span.current').html() ) + 1;
-            else if ( j(target).hasClass('prev') )
-                var page_number = Number( j('div.pagination span.current').html() ) - 1;
-            else
-                var page_number = Number( j(target).html() );
-
-            bp_filter_request( j.cookie('bp-' + object + '-type'), j.cookie('bp-' + object + '-filter'), object, 'div.' + object, page_number, j.cookie('bp-' + object + '-search-terms') );
-
-            return false;
-        }
-
     });
 

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

@@ -23 +23 @@
 
                         <?php if ( is_user_logged_in() ) : ?>
-                            <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
-                            <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
+
+                            <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
+                                <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
+                            <?php endif; ?>
+
+                            <?php if ( bp_get_total_group_count( bp_loggedin_user_id() ) ) : ?>
+                                <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
+                            <?php endif; ?>
+
                         <?php endif; ?>
 

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

@@ -5 +5 @@
 
         <div id="footer">
-            <p><?php printf( __( '%s is proudly powered by <a href="http://mu.wordpress.org">WordPress MU</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), bloginfo('name') ); ?></p>
+            <?php if ( bp_core_is_multiblog_install() ) : ?>
+                <p><?php printf( __( '%s is proudly powered by <a href="http://mu.wordpress.org">WordPress MU</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), bloginfo('name') ); ?></p>
+            <?php else : ?>
+                <p><?php printf( __( '%s is proudly powered by <a href="http://wordpress.org">WordPress</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), bloginfo('name') ); ?></p>
+            <?php endif; ?>
 
             <?php do_action( 'bp_footer' ) ?>

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

@@ -61 +61 @@
                 <?php endif; ?>
 
-                <?php if ( function_exists( 'bp_blogs_install' ) ) : ?>
+                <?php if ( function_exists( 'bp_blogs_install' ) && bp_core_is_multiblog_install() ) : ?>
                     <li<?php if ( bp_is_page( BP_BLOGS_SLUG ) ) : ?> class="selected"<?php endif; ?>>
                         <a href="<?php echo site_url() ?>/<?php echo BP_BLOGS_SLUG ?>" title="<?php _e( 'Blogs', 'buddypress' ) ?>"><?php _e( 'Blogs', 'buddypress' ) ?></a>

trunk/bp-themes/bp-default/registration/register.php

@@ -12 +12 @@
             <?php if ( 'request-details' == bp_get_current_signup_step() ) : ?>
 
-                <h2 class="pagetitle"><?php _e( 'Create an Account', 'buddypress' ) ?></h2>
+                <h2><?php _e( 'Create an Account', 'buddypress' ) ?></h2>
 
                 <?php do_action( 'template_notices' ) ?>
@@ -161 +161 @@
                 <?php do_action( 'bp_after_signup_profile_fields' ) ?>
 
-                <?php if ( 'all' == bp_get_signup_allowed() || 'blog' == bp_get_signup_allowed() ) : ?>
+                <?php if ( bp_core_is_multiblog_install() && 'all' == bp_get_signup_allowed() || 'blog' == bp_get_signup_allowed() ) : ?>
 
                     <?php do_action( 'bp_before_blog_details_fields' ) ?>
@@ -216 +216 @@
             <?php if ( 'completed-confirmation' == bp_get_current_signup_step() ) : ?>
 
-                <h2 class="pagetitle"><?php _e( 'Sign Up Complete!', 'buddypress' ) ?></h2>
+                <h2><?php _e( 'Sign Up Complete!', 'buddypress' ) ?></h2>
 
                 <?php do_action( 'template_notices' ) ?>
 
-                <p><?php _e( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' ) ?></p>
+                <?php if ( bp_registration_needs_activation() ) : ?>
+                    <p><?php _e( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' ) ?></p>
+                <?php else : ?>
+                    <p><?php _e( 'You have successfully created your account! Please log in using the username and password you have just created.', 'buddypress' ) ?></p>
+                <?php endif; ?>
 
                 <?php if ( !(int)get_site_option( 'bp-disable-avatar-uploads' ) ) : ?>
@@ -227 +231 @@
 
                         <h3><?php _e( 'Your Current Avatar', 'buddypress' ) ?></h3>
-                        <p><?php _e( "We've fetched an avatar for your new account. If you'd like to change this, why not upload a new one while you wait for your activation email?", 'buddypress' ) ?></p>
+                        <p><?php _e( "We've fetched an avatar for your new account. If you'd like to change this, why not upload a new one?", 'buddypress' ) ?></p>
 
                         <div id="signup-avatar">

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

@@ -16 +16 @@
     <?php else : ?>
 
-        <p id="login-text"><?php printf( __( 'To start connecting please log in first. You can also <a href="%s" title="Create an account">create an account</a>.', 'buddypress' ), site_url( BP_REGISTER_SLUG . '/' ) ) ?></p>
+        <p id="login-text">
+            <?php _e( 'To start connecting please log in first.', 'buddypress' ) ?>
+            <?php if ( bp_get_signup_allowed() ) : ?>
+                <?php printf( __( ' You can also <a href="%s" title="Create an account">create an account</a>.', 'buddypress' ), site_url( BP_REGISTER_SLUG . '/' ) ) ?>
+            <?php endif; ?>
+        </p>
 
         <form name="login-form" id="login-form" class="standard-form" action="<?php echo site_url( 'wp-login.php', 'login' ) ?>" method="post">

trunk/bp-xprofile.php

@@ -1037 +1037 @@
         $directory = 'avatars';
 
-    $path  = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
-    $newdir = WP_CONTENT_DIR . str_replace( 'wp-content', '', $path );
-    $newdir .= '/avatars/' . $user_id;
-
-    $newbdir = $newdir;
-
-    if ( !file_exists( $newdir ) )
-        @wp_mkdir_p( $newdir );
-
-    $newurl = WP_CONTENT_URL . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $directory . '/' . $user_id;
+    $path  = BP_AVATAR_UPLOAD_PATH . '/avatars/' . $user_id;
+    $newbdir = $path;
+
+    if ( !file_exists( $path ) )
+        @wp_mkdir_p( $path );
+
+    $newurl = str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, $path );
     $newburl = $newurl;
     $newsubdir = '/avatars/' . $user_id;
 
-    return apply_filters( 'xprofile_avatar_upload_dir', array( 'path' => $newdir, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
+    return apply_filters( 'xprofile_avatar_upload_dir', array( 'path' => $path, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
 }