Ticket #6026: 6026.02.patch

src/bp-activity/bp-activity-loader.php

@@ -225 +225 @@
                         );
                 }
 
+                // Additional menu if blogs is active
+                if ( bp_is_active( 'blogs' ) && ! bp_blogs_disable_single_items() ) {
+                        $sub_nav[] = array(
+                                'name'            => _x( 'Sites', 'Profile activity screen sub nav', 'buddypress' ),
+                                'slug'            => bp_get_blogs_slug(),
+                                'parent_url'      => $activity_link,
+                                'parent_slug'     => $this->slug,
+                                'screen_function' => 'bp_activity_screen_blogs',
+                                'position'        => 60,
+                                'item_css_id'     => 'activity-blogs'
+                        );
+                }
+
                 parent::setup_nav( $main_nav, $sub_nav );
         }
 
@@ -322 +335 @@
                                         'href'   => trailingslashit( $activity_link . bp_get_groups_slug() )
                                 );
                         }
+
+                        // Blogs?
+                        if ( bp_is_active( 'blogs' ) && ! bp_blogs_disable_single_items() ) {
+                                $wp_admin_nav[] = array(
+                                        'parent' => 'my-account-' . $this->id,
+                                        'id'     => 'my-account-' . $this->id . '-blogs',
+                                        'title'  => _x( 'Sites', 'My Account Activity sub nav', 'buddypress' ),
+                                        'href'   => trailingslashit( $activity_link . bp_get_blogs_slug() )
+                                );
+                        }
                 }
 
                 parent::setup_admin_bar( $wp_admin_nav );

src/bp-activity/bp-activity-screens.php

@@ -149 +149 @@
 }
 
 /**
+ * Load the 'My Blogs' activity page.
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_activity_screen_blogs() {
+        if ( ! bp_is_active( 'blogs' ) || bp_blogs_disable_single_items() ) {
+                return false;
+        }
+
+        bp_update_is_item_admin( bp_current_user_can( 'bp_moderate' ), 'activity' );
+
+        /**
+         * Fires right before the loading of the "My Groups" screen template file.
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        do_action( 'bp_activity_screen_blogs' );
+
+        /**
+         * Filters the template to load for the "My Blogs" screen.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param string $template Path to the activity template to load.
+         */
+        bp_core_load_template( apply_filters( 'bp_activity_template_blogs_activity', 'members/single/home' ) );
+}
+
+/**
  * Load the 'Favorites' activity page.
  *
  * @since BuddyPress (1.2.0)

src/bp-activity/bp-activity-template.php

@@ -626 +626 @@
                 $object      = $bp->groups->id;
                 $primary_id  = bp_get_current_group_id();
                 $show_hidden = (bool) ( groups_is_user_member( bp_loggedin_user_id(), $primary_id ) || bp_current_user_can( 'bp_moderate' ) );
+        } elseif ( bp_is_blog() ) {
+                $object      = $bp->blogs->id;
+                $primary_id  = bp_get_current_blog_id();
+                $show_hidden = false;
         } else {
                 $object      = false;
                 $primary_id  = false;
@@ -4416 +4420 @@
                         if ( bp_is_user() ) {
                                 if ( bp_is_active( 'groups' ) && bp_is_current_action( bp_get_groups_slug() ) ) {
                                         $context = 'member_groups';
+                                } elseif ( bp_is_active( 'blogs' ) && bp_is_current_action( bp_get_blogs_slug() ) ) {
+                                        $context = 'member_blogs';
                                 } else {
                                         $context = 'member';
                                 }

src/bp-blogs/bp-blogs-actions.php

@@ -32 +32 @@
         }
 }
 add_action( 'bp_actions', 'bp_blogs_redirect_to_random_blog' );
+
+/**
+ * Check if the user needs to set an avatar for his just registered blog.
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_maybe_redirect_to_single_blog() {
+        if ( ! is_multisite() || ! is_user_logged_in() || ! bp_blogs_is_avatar_uploads_enabled() ) {
+                return;
+        }
+
+        $transient_key = sprintf( '_bp_activation_%d_redirect', bp_loggedin_user_id() );
+        $blog_id = get_transient( $transient_key );
+
+        if ( empty( $blog_id ) ) {
+                return;
+        }
+
+        // Delete the redirect transient
+        delete_transient( $transient_key );
+
+        $single_blog = bp_blogs_get_blog( array( 'blog_id' => $blog_id ) );
+
+        if ( empty( $single_blog->slug ) ) {
+                return;
+        }
+
+        $redirect = trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/' . $single_blog->slug . '/manage/edit-logo' );
+
+        bp_core_add_message( __( 'Welcome to the profile area of your new site, please consider adding a site logo for your site', 'buddypress' ) );
+        bp_core_redirect( esc_url( $redirect ) );
+}
+add_action( 'bp_blogs_setup_nav', 'bp_blogs_maybe_redirect_to_single_blog' );

src/bp-blogs/bp-blogs-activity.php

@@ -32 +32 @@
                         __( 'New site created', 'buddypress' ),
                         'bp_blogs_format_activity_action_new_blog',
                         __( 'New Sites', 'buddypress' ),
-                        0
+                        array()
                 );
         }
 
@@ -44 +44 @@
                         __( 'New post comment posted', 'buddypress' ),
                         'bp_blogs_format_activity_action_new_blog_comment',
                         __( 'Comments', 'buddypress' ),
-                        array( 'activity', 'member' ),
+                        array( 'activity', 'member', 'blog', 'member_blogs' ),
                         10
                 );
         }
 
         /**
+         * Only add subscription actions if subscription are enabled
+         * for current blog, or when viewing the blogs activities on
+         * a user's profile
+         */
+        if ( bp_current_blog_can_subscribe() || bp_is_user() || bp_is_activity_directory() ) {
+                bp_activity_set_action(
+                buddypress()->blogs->id,
+                        'site_subscription',
+                        __( 'New site subscription', 'buddypress' ),
+                        'bp_blogs_format_activity_action_new_site_subscription',
+                        __( 'Site Subscriptions', 'buddypress' ),
+                        array( 'activity', 'member', 'blog', 'member_blogs' ),
+                        20
+                );
+        }
+
+        /**
          * Fires after the registry of the default blog component activity actions.
          *
          * @since BuddyPress (1.1.0)
@@ -281 +298 @@
 }
 
 /**
+ * Activity action callback for new site subscriptions
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param  string  $action      the content of the action
+ * @param  BP_Activity_Activity the activity object
+ * @return string  $action      the content of the action
+ */
+function bp_blogs_format_activity_action_new_site_subscription( $action = '', $activity = null ) {
+        if ( empty( $activity->item_id ) ) {
+                return $action;
+        }
+
+        $user_link         = bp_core_get_userlink( $activity->user_id );
+        $blog_name         = bp_blogs_get_blogmeta( $activity->item_id, 'name' );
+        $blog_url          = bp_blogs_get_blogmeta( $activity->item_id, 'url' );
+        $root_domain       = trailingslashit( bp_get_root_domain() );
+
+        if ( (int) $activity->item_id !== (int) get_current_site()->id ) {
+                $view_details_link = trailingslashit( $root_domain . bp_get_blogs_root_slug() . str_replace( $root_domain, '/', $blog_url ) );
+        } else {
+                $view_details_link = trailingslashit( $root_domain . bp_get_blogs_root_slug() . '/' . apply_filters( 'bp_blogs_get_site_slug', 'root' ) );
+        }
+
+        $action = sprintf(
+                __( '%1$s subscribed to the site %2$s', 'bp-blogs-extended' ),
+                $user_link,
+                '<a href="' . esc_url( $view_details_link ) . '">' . esc_html( $blog_name ) . '</a>'
+        );
+
+        return apply_filters( 'bp_blogs_format_activity_action_new_site_subscription', $action, $activity );
+}
+
+/**
  * Fetch data related to blogs at the beginning of an activity loop.
  *
  * This reduces database overhead during the activity loop.
@@ -314 +365 @@
 add_filter( 'bp_activity_prefetch_object_data', 'bp_blogs_prefetch_activity_object_data' );
 
 /**
+ * Set up activity arguments for use with the 'blogs' scope.
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param array $retval Empty array by default
+ * @param array $filter Current activity arguments
+ * @return array
+ */
+function bp_blogs_filter_activity_scope( $retval = array(), $filter = array() ) {
+
+        // Determine the user_id
+        if ( ! empty( $filter['user_id'] ) ) {
+                $user_id = $filter['user_id'];
+        } else {
+                $user_id = bp_displayed_user_id()
+                        ? bp_displayed_user_id()
+                        : bp_loggedin_user_id();
+        }
+
+        // Determine blogs of user
+        $blogs = bp_blogs_get_blogs_for_user( $user_id );
+        if ( empty( $blogs['blogs'] ) ) {
+                $blogs = array( 'blogs' => 0 );
+        } else {
+                $blogs['blogs'] = array_keys( $blogs['blogs'] );
+        }
+
+        // Should we show all items regardless of sitewide visibility?
+        $show_hidden = array();
+        if ( ! empty( $user_id ) && ( $user_id !== bp_loggedin_user_id() ) ) {
+                $show_hidden = array(
+                        'column' => 'hide_sitewide',
+                        'value'  => 0
+                );
+        }
+
+        $retval = array(
+                'relation' => 'AND',
+                array(
+                        'relation' => 'AND',
+                        array(
+                                'column' => 'component',
+                                'value'  => buddypress()->blogs->id
+                        ),
+                        array(
+                                'column'  => 'item_id',
+                                'compare' => 'IN',
+                                'value'   => (array) $blogs['blogs']
+                        ),
+                ),
+                $show_hidden,
+
+                // overrides
+                'override' => array(
+                        'filter'      => array( 'user_id' => 0 ),
+                        'show_hidden' => true
+                ),
+        );
+
+        return $retval;
+}
+add_filter( 'bp_activity_set_blogs_scope_args', 'bp_blogs_filter_activity_scope', 10, 2 );
+
+/**
  * Record blog-related activity to the activity stream.
  *
  * @since BuddyPress (1.0.0)

src/bp-blogs/bp-blogs-cache.php

@@ -56 +56 @@
 add_action( 'wpmu_new_blog',                 'bp_blogs_clear_blog_object_cache', 10, 2 );
 add_action( 'bp_blogs_remove_blog',          'bp_blogs_clear_blog_object_cache' );
 
+/**
+ * Bust blog caches when editing or deleting.
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param int $blog_id The blog being edited.
+ */
+function bp_blogs_delete_blog_cache( $blog_id = 0 ) {
+        wp_cache_delete( $blog_id, 'bp_blogs' );
+}
+add_action( 'refresh_blog_details',          'bp_blogs_delete_blog_cache' );
+add_action( 'bp_blogs_remove_blog',          'bp_blogs_delete_blog_cache' );
+add_action( 'bp_blogs_remove_data_for_blog', 'bp_blogs_delete_blog_cache' );
+add_action( 'bp_blogs_remove_blog_for_user', 'bp_blogs_delete_blog_cache' );
+
+/**
+ * Bust blogs caches when a user was deleted or marked as spam
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param int $blog_id The blog being edited.
+ */
+function bp_blogs_delete_blogs_cache( $user_id = 0 ) {
+        $blogs = get_blogs_of_user( $user_id );
+
+        if ( empty( $blogs ) ) {
+                return;
+        }
+
+        foreach ( $blogs as $blog ) {
+                wp_cache_delete( $blog->userblog_id, 'bp_blogs' );
+        }
+}
+add_action( 'bp_blogs_before_remove_data', 'bp_blogs_delete_blogs_cache' );
+
+/**
+ * Bust blog caches when a user or a blog option was edited
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param int $blog_id The blog being edited.
+ */
+function bp_blogs_delete_blog_cache_on_change() {
+        if ( ! is_multisite() ) {
+                return;
+        }
+
+        $blog_id = get_current_blog_id();
+
+        wp_cache_delete( $blog_id, 'bp_blogs' );
+}
+add_action( 'set_user_role',                              'bp_blogs_delete_blog_cache_on_change' );
+add_action( 'update_option_blogname',                     'bp_blogs_delete_blog_cache_on_change' );
+add_action( 'update_option_blogdescription',              'bp_blogs_delete_blog_cache_on_change' );
+add_action( 'update_option_thread_comments_depth',        'bp_blogs_delete_blog_cache_on_change' );
+add_action( 'update_option_thread_comments',              'bp_blogs_delete_blog_cache_on_change' );
+add_action( 'update_option_close_comments_days_old',      'bp_blogs_delete_blog_cache_on_change' );
+add_action( 'update_option_close_comments_for_old_posts', 'bp_blogs_delete_blog_cache_on_change' );
+
 // List actions to clear super cached pages on, if super cache is installed
 add_action( 'bp_blogs_remove_data_for_blog', 'bp_core_clear_cache' );
 add_action( 'bp_blogs_remove_comment',       'bp_core_clear_cache' );

src/bp-blogs/bp-blogs-functions.php

@@ -23 +23 @@
 }
 
 /**
+ * Fetch a single blog object.
+ *
+ * @since  BuddyPress (2.3.0)
+ *
+ * @param array $args {
+ *      Array of arguments.
+ *      @type int $blog_id ID of the blog.
+ *      @type bool $populate_extras Whether to fetch extra information about the blog.
+ *                 Default: True.
+ * @return BP_Blogs_Blog $blog The blog object.
+ */
+function bp_blogs_get_blog( $args = '' ) {
+        // Parse query arguments
+        $r = bp_parse_args( $args, array(
+                'blog_id'         => 0,
+                'populate_extras' => true // Whether to populate blogmeta
+        ), 'blogs_get_blog' );
+
+        $blog_args = array(
+                'populate_extras' => $r['populate_extras'],
+        );
+
+        if ( $r['populate_extras'] ) {
+                // Check cache for blog data
+                $blog = wp_cache_get( $r['blog_id'], 'bp_blogs' );
+
+                // Got Cache
+                if ( false !== $blog ) {
+                        return $blog;
+                }
+        }
+
+        $blog = new BP_Blogs_Blog( $r['blog_id'], $blog_args );
+
+        if ( $r['populate_extras'] && ! empty( $blog->id ) ) {
+                wp_cache_set( $blog->id, $blog, 'bp_blogs' );
+        }
+
+        /**
+         * Filters a single blog object.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param BP_Blogs_Blog $blog Single blog object.
+         */
+        return apply_filters( 'bp_blogs_get_blog', $blog );
+}
+
+/**
+ * Get the BP_Blogs_Blog object corresponding to the current blog.
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @return BP_Blogs_Blog The current blog object.
+ */
+function bp_blogs_get_current_blog() {
+        $bp = buddypress();
+
+        $current_blog = false;
+
+        if ( isset( $bp->blogs->current_blog ) ) {
+                $current_blog = $bp->blogs->current_blog;
+        }
+
+        /**
+         * Filters the BP_Blogs_Blog object corresponding to the current blog.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param BP_Blogs_Blog $current_blog Current BP_Blogs_Blog object.
+         */
+        return apply_filters( 'bp_blogs_get_current_blog', $current_blog );
+}
+
+/**
+ * Is the user able to access to single blog's content
+ *
+ * @since BuddyPress (2.3.0)
+ * @uses apply_filters() Filter bp_current_blog_has_access to modify the access to the blog
+ *
+ * @return bool true if the user can access, false otherwise
+ */
+function bp_current_blog_has_access() {
+        $current_blog    = bp_blogs_get_current_blog();
+        $has_access      = false;
+
+        if ( isset( $current_blog->user_has_access ) ) {
+                $has_access = $current_blog->user_has_access;
+        }
+
+        /**
+         * Filters the access to the current blog
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param bool   $has_access true if user can access, false otherwise.
+         * @param object $current_blog Instance holding the current blog.
+         */
+        return (bool) apply_filters( 'bp_current_blog_has_access', $has_access, $current_blog );
+}
+
+/**
+ * Is the current blog item public
+ *
+ * @since BuddyPress (2.3.0)
+ * @uses apply_filters() Filter bp_is_blog_public to edit the blog visibility
+ *
+ * @return bool true if the blog is public, false otherwise
+ */
+function bp_current_blog_is_public() {
+        $current_blog    = bp_blogs_get_current_blog();
+        $is_public       = false;
+
+        if ( isset( $current_blog->blog_public ) ) {
+                $is_public = $current_blog->blog_public;
+        }
+
+        /**
+         * Filters activity visibility of the blog
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param bool   $is_public true if blog is public, false otherwise.
+         * @param object $current_blog Instance holding the current blog.
+         */
+        return (bool) apply_filters( 'bp_is_blog_public', $is_public, $current_blog );
+}
+
+/**
+ * Can users subscribe to the current blog
+ *
+ * @since BuddyPress (2.3.0)
+ * @uses apply_filters() Filter bp_current_blog_can_subscribe to edit the ability to join the blog
+ *
+ * @return bool true if users can subscribe to the current blog, false otherwise
+ */
+function bp_current_blog_can_subscribe() {
+        $current_blog    = bp_blogs_get_current_blog();
+
+        // Defaults to site's visibility
+        $can_subscribe   = bp_current_blog_is_public();
+
+
+        if ( isset( $current_blog->disallow_subscriptions ) ) {
+                $can_subscribe = ! $current_blog->disallow_subscriptions;
+        }
+
+        /**
+         * Filters subscriptions setting for the blog
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param bool   $can_subscribe true if subscription are enabled, false otherwise.
+         * @param object $current_blog Instance holding the current blog.
+         */
+        return (bool) apply_filters( 'bp_current_blog_can_subscribe', $can_subscribe, $current_blog );
+}
+
+/**
+ * Is current user a member of the current blog ?
+ *
+ * @since BuddyPress (2.3.0)
+ * @uses apply_filters() Filter bp_current_blog_is_member to edit the user membership
+ *
+ * @return bool true if the user is a member of the current blog, false otherwise
+ */
+function bp_current_blog_is_member() {
+        $current_blog    = bp_blogs_get_current_blog();
+        $is_member       = false;
+
+
+        if ( isset( $current_blog->is_member ) ) {
+                $is_member = $current_blog->is_member;
+        }
+
+        /**
+         * Filters subscriptions setting for the blog
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param bool   $is_member true if the user is a member of the current blog, false otherwise.
+         * @param object $current_blog Instance holding the current blog.
+         */
+        return (bool) apply_filters( 'bp_current_blog_is_member', $is_member, $current_blog );
+}
+
+/**
+ * Adds a relationship between a user and a blog
+ *
+ * We don't use bp_blogs_add_user_to_blog() to avoid recording blogmetas
+ * @see bp_blogs_record_blog()
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @return bool true if the relationship was created, false otherwise
+ */
+function bp_blogs_link_user_to_blog( $user_id = 0, $blog_id = 0 ) {
+        if ( empty( $user_id ) || empty( $blog_id ) ) {
+                return false;
+        }
+
+        // Create the relationship between user & blog
+        $join_blog = new BP_Blogs_Blog;
+        $join_blog->user_id = $user_id;
+        $join_blog->blog_id = $blog_id;
+
+        if ( ! $join_blog->save() ) {
+                return false;
+        }
+
+        return true;
+}
+
+/**
+ * Subscribe a user to a blog
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @return array the result in a feedback array
+ */
+function bp_blogs_join_blog() {
+        $blog = bp_blogs_get_current_blog();
+
+        if ( ! bp_current_blog_can_subscribe() || empty( $blog->id ) ) {
+                return array(
+                        'message' => __( 'We were not able to perform this action, please try again later', 'bp-blogs-extended' ),
+                        'type'    => 'error',
+                );
+        }
+
+        /**
+         * Fires before the user joins the blog
+         */
+        do_action( 'bp_blogs_before_join_blog', bp_loggedin_user_id(), $blog );
+
+        // No need to use this action
+        remove_action( 'add_user_to_blog', 'bp_blogs_add_user_to_blog', 10, 3 );
+
+        // First WordPress
+        $subscribed = add_user_to_blog( $blog->id, bp_loggedin_user_id(), 'subscriber' );
+
+        // Restore the action
+        add_action( 'add_user_to_blog', 'bp_blogs_add_user_to_blog', 10, 3 );
+
+        if ( is_wp_error( $subscribed ) ) {
+                $result = array(
+                        'message' => $subscribed->get_error_message(),
+                        'type'    => 'error',
+                );
+        } else {
+                // Then BuddyPress
+                bp_blogs_link_user_to_blog( bp_loggedin_user_id(), $blog->id );
+
+                $result = array(
+                        'message' => __( 'You successfully joined to the site.', 'bp-blogs-extended' ),
+                        'type'    => '',
+                );
+
+                $user_link = bp_core_get_userlink( bp_loggedin_user_id() );
+
+                $action = sprintf(
+                        __( '%1$s subscribed to the site %2$s', 'bp-blogs-extended' ),
+                        $user_link,
+                        '<a href="' . esc_url( bp_get_blog_view_details_link() ) . '">' . esc_html( $blog->name ) . '</a>'
+                );
+
+                bp_blogs_record_activity( array(
+                        'action'  => $action,
+                        'type'    => 'site_subscription',
+                        'item_id' => $blog->id,
+                ) );
+
+                // Update the blog's last activity.
+                bp_blogs_update_blogmeta( $blog->id, 'last_activity', bp_core_current_time() );
+
+                /**
+                 * Fires after the user joined the blog
+                 */
+                do_action( 'bp_blogs_joined_blog', bp_loggedin_user_id(), $blog );
+        }
+
+        return $result;
+}
+
+/**
+ * Unsubscribe a user from a blog
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @return array the result in a feedback array
+ */
+function bp_blogs_leave_blog() {
+        $blog = bp_blogs_get_current_blog();
+
+        if ( empty( $blog->id ) || bp_is_item_admin() ) {
+                return array(
+                        'message' => __( 'We were not able to perform this action, please try again later', 'bp-blogs-extended' ),
+                        'type'    => 'error',
+                );
+        }
+
+        /**
+         * Fires before the user leaves the blog
+         */
+        do_action( 'bp_blogs_before_leave_blog', bp_loggedin_user_id(), $blog );
+
+        /**
+         * bp_blogs_remove_user_from_blog() will hook WordPress to remove
+         * the link between the user and the blog
+         */
+        $unsubscribed = remove_user_from_blog( bp_loggedin_user_id(), $blog->id );
+
+        if ( is_wp_error( $unsubscribed ) ) {
+                $result = array(
+                        'message' => $unsubscribed->get_error_message(),
+                        'type'    => 'error',
+                );
+        } else {
+                $result = array(
+                        'message' => __( 'You successfully left the site.', 'buddypress' ),
+                        'type'    => '',
+                );
+
+                bp_blogs_delete_activity( array(
+                        'user_id' => bp_loggedin_user_id(),
+                        'item_id' => $blog->id,
+                        'type'    => 'site_subscription',
+                ) );
+
+                /**
+                 * Fires after the user left the blog
+                 */
+                do_action( 'bp_blogs_left_blog', bp_loggedin_user_id(), $blog );
+        }
+
+        return $result;
+}
+
+/** Blog Avatars ***************************************************************/
+
+/**
+ * Generate the avatar upload directory path for a given blog.
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param int $blog_id Optional. ID of the blog. Default: ID of the
+ *        current blog.
+ * @return string
+ */
+function blogs_avatar_upload_dir( $blog_id = 0 ) {
+
+        if ( empty( $blog_id ) ) {
+                $blog_id = bp_get_current_blog_id();
+        }
+
+        $directory = 'blog-avatars';
+        $path      = bp_core_avatar_upload_path() . '/' . $directory . '/' . $blog_id;
+        $newbdir   = $path;
+        $newurl    = bp_core_avatar_url() . '/' . $directory . '/' . $blog_id;
+        $newburl   = $newurl;
+        $newsubdir = '/' . $directory . '/' . $blog_id;
+
+        /**
+         * Filters the avatar upload directory path for a given blog.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param array $value Array of parts related to the blog avatar upload directory.
+         */
+        return apply_filters( 'blogs_avatar_upload_dir', array(
+                'path'    => $path,
+                'url'     => $newurl,
+                'subdir'  => $newsubdir,
+                'basedir' => $newbdir,
+                'baseurl' => $newburl,
+                'error'   => false
+        ) );
+}
+
+/**
+ * Check if avatar uploads are enabled
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @return bool true if avatar uploads are enabled, false otherwise.
+ */
+function bp_blogs_is_avatar_uploads_enabled() {
+        $bp = buddypress();
+
+        // If Blogs single items are disabled no need to carry on.
+        if ( bp_blogs_disable_single_items() ) {
+                return false;
+        }
+
+        /**
+         * Check if :
+         * - user can upload avatars
+         * - the WordPress show avatars setting is enabled
+         * - the new avatar UI is not disabled.
+         */
+        $is_avatar_enabled = ! (int) $bp->site_options['bp-disable-avatar-uploads'] && $bp->avatar->show_avatars && false !== (bool) apply_filters( 'bp_avatar_is_front_edit', true );
+
+        /**
+         * Filters the ability to set an avatar for a given blog.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param bool $is_avatar_enabled true if avatar uploads are enabled, false otherwise.
+         */
+        return (bool) apply_filters( 'bp_blogs_is_avatar_uploads_enabled', $is_avatar_enabled );
+}
+
+/**
  * Retrieve a set of blogs
  *
  * @see BP_Blogs_Blog::get() for a description of arguments and return value.
@@ -846 +1259 @@
                 'type'      => 'new_blog'
         ) );
 
+        // Remove the site logo.
+        if ( is_multisite() && bp_blogs_is_avatar_uploads_enabled() ) {
+                bp_core_delete_existing_avatar( array( 'item_id' => $blog_id, 'object' => 'blog' ) );
+        }
+
         /**
          * Fires after a "blog created" item has been removed from blogs
          * tracker and activity stream.

src/bp-blogs/bp-blogs-loader.php

@@ -77 +77 @@
                 // Setup the globals
                 parent::setup_globals( $args );
 
-                /*
+                /**
                  * Set up the post post type to track.
                  *
                  * In case the config is not multisite, the blog_public option is ignored.
@@ -100 +100 @@
 
                 // Filter the generic track parameters for the 'post' post type.
                 add_filter( 'bp_activity_get_post_type_tracking_args', array( $this, 'post_tracking_args' ), 10, 2 );
+
+                /** Single Blog globals ***********************************************/
+
+                if ( is_multisite() && bp_is_blogs_component() && bp_current_action() && ! bp_blogs_disable_single_items() ) {
+
+                        /**
+                         * Set the blogs single nav
+                         *
+                         * We need to do this early so that we can manage item access
+                         * within the single nav
+                         */
+                        $this->single_nav    = array();
+                        $this->single_subnav = array();
+
+                        // Sort the single item nav
+                        add_action( 'wp_head', array( $this, 'sort_single_item_nav' ) );
+
+                        /**
+                         * Use this filter to define a new slug for the network root site
+                         *
+                         * @since  BuddyPress (2.3.0)
+                         *
+                         * @param  string $slug the alias for the network root slug
+                         */
+                        if ( bp_is_current_action( apply_filters( 'bp_blogs_get_site_slug', 'root' ) ) ) {
+                                $blog_id = get_current_site()->id;
+                        } else {
+                                $blog_id = get_id_from_blogname( bp_current_action() );
+                        }
+
+                        // Set the current blog data
+                        $this->current_blog = bp_blogs_get_blog( array( 'blog_id' => $blog_id ) );
+
+                        if ( empty( $this->current_blog->id ) ) {
+                                $this->current_blog = 0;
+                                bp_do_404();
+                                return;
+                        }
+
+                        // It's a blog single item
+                        $bp->is_single_item  = true;
+                        $bp->current_item   = $this->current_blog->slug;
+                        $bp->current_action = bp_action_variable( 0 );
+                        array_shift( $bp->action_variables );
+
+                        // By Default grant access
+                        $this->current_blog->user_has_access = true;
+
+                        // If blog is not public, non members can't access
+                        if ( ! $this->current_blog->blog_public && ! $this->current_blog->is_member ) {
+                                $this->current_blog->user_has_access = false;
+                        }
+
+                        $admin_keys = array_flip( wp_list_pluck( $this->current_blog->admins, 'ID' ) );
+
+                        if ( is_super_admin() || isset( $admin_keys[ bp_loggedin_user_id() ] ) ) {
+                                bp_update_is_item_admin( true, $bp->blogs->id );
+                        }
+
+                        // Check once if the current blog has a custom front template
+                        $this->current_blog->front_template = bp_blogs_get_blog_front_template( $this->current_blog );
+                }
+        }
+
+        /**
+         * Set up canonical stack for this component.
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        public function setup_canonical_stack() {
+                $bp = buddypress();
+
+                if ( ! bp_is_blogs_component() ) {
+                        return;
+                }
+
+                if ( empty( $this->current_blog ) ) {
+                        return;
+                }
+
+                if ( ! bp_current_action() ) {
+                        $bp->current_action = 'home';
+                }
+
+                // Prepare for a redirect to the canonical URL
+                $bp->canonical_stack['base_url'] = trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/'. $this->current_blog->slug );
+
+                if ( bp_current_action() ) {
+                        $bp->canonical_stack['action'] = bp_current_action();
+                }
+
+                if ( ! empty( $bp->action_variables ) ) {
+                        $bp->canonical_stack['action_variables'] = bp_action_variables();
+                }
+
+                // When viewing the default extension, the canonical URL should not have
+                // that extension's slug, unless more has been tacked onto the URL via
+                // action variables
+                if ( bp_is_current_action( 'home' ) && empty( $bp->action_variables ) )  {
+                        unset( $bp->canonical_stack['action'] );
+                }
         }
 
         /**
@@ -125 +226 @@
 
                 if ( is_multisite() ) {
                         $includes[] = 'widgets';
+
+                        if ( ! bp_blogs_disable_single_items() ) {
+                                $includes[] = 'notifications';
+                        }
                 }
 
                 // Include the files
@@ -153 +258 @@
                         return false;
                 }
 
-                // Add 'Sites' to the main navigation
-                $count    = (int) bp_get_total_blog_count_for_user();
-                $class    = ( 0 === $count ) ? 'no-count' : 'count';
-                $nav_text = sprintf( __( 'Sites <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count )  );
-                $main_nav = array(
-                        'name'                => $nav_text,
-                        'slug'                => $this->slug,
-                        'position'            => 30,
-                        'screen_function'     => 'bp_blogs_screen_my_blogs',
-                        'default_subnav_slug' => 'my-sites',
-                        'item_css_id'         => $this->id
-                );
-
                 // Determine user to use
                 if ( bp_displayed_user_domain() ) {
                         $user_domain = bp_displayed_user_domain();
                 } elseif ( bp_loggedin_user_domain() ) {
                         $user_domain = bp_loggedin_user_domain();
                 } else {
-                        return;
+                        $user_domain = false;
                 }
 
-                $parent_url = trailingslashit( $user_domain . bp_get_blogs_slug() );
+                if ( ! empty( $user_domain ) ) {
+                        // Add 'Sites' to the main navigation
+                        $count    = (int) bp_get_total_blog_count_for_user();
+                        $class    = ( 0 === $count ) ? 'no-count' : 'count';
+                        $nav_text = sprintf( __( 'Sites <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count )  );
+                        $main_nav = array(
+                                'name'                => $nav_text,
+                                'slug'                => $this->slug,
+                                'position'            => 30,
+                                'screen_function'     => 'bp_blogs_screen_my_blogs',
+                                'default_subnav_slug' => 'my-sites',
+                                'item_css_id'         => $this->id
+                        );
+
+                        $parent_url = trailingslashit( $user_domain . bp_get_blogs_slug() );
 
-                $sub_nav[] = array(
-                        'name'            => __( 'My Sites', 'buddypress' ),
-                        'slug'            => 'my-sites',
-                        'parent_url'      => $parent_url,
-                        'parent_slug'     => $bp->blogs->slug,
-                        'screen_function' => 'bp_blogs_screen_my_blogs',
-                        'position'        => 10
-                );
+                        $sub_nav[] = array(
+                                'name'            => __( 'My Sites', 'buddypress' ),
+                                'slug'            => 'my-sites',
+                                'parent_url'      => $parent_url,
+                                'parent_slug'     => $bp->blogs->slug,
+                                'screen_function' => 'bp_blogs_screen_my_blogs',
+                                'position'        => 10
+                        );
+
+                        // Setup navigation
+                        parent::setup_nav( $main_nav, $sub_nav );
+                }
+
+                if ( bp_is_blogs_component() && bp_is_single_item() ) {
+
+                        $main_nav_items = array(
+                                array(
+                                        'name'                => __( 'Home', 'buddypress' ),
+                                        'slug'                => 'home',
+                                        'position'            => 0,
+                                        'screen_function'     => 'bp_blogs_screen_blog_home',
+                                        'default_subnav_slug' => false,
+                                        'item_css_id'         => 'all',
+                                        'single_nav'          => $this->id,
+                                ),
+                        );
+
+                        if ( bp_current_blog_has_access() ) {
+
+                                if ( $this->current_blog->front_template || ( bp_is_active( 'activity' ) && bp_current_blog_is_public() ) ) {
+                                        /**
+                                         * Only add the members nav if it's not the home's nav
+                                         */
+                                        $main_nav_items[] = array(
+                                                'name'                => sprintf( _x( 'Members <span>%s</span>', 'Single Blog members screen nav', 'buddypress' ), $this->current_blog->total_member_count ),
+                                                'slug'                => 'members',
+                                                'position'            => 20,
+                                                'screen_function'     => 'bp_blogs_screen_blog_home',
+                                                'default_subnav_slug' => false,
+                                                'item_css_id'         => 'all',
+                                                'single_nav'          => $this->id,
+                                        );
+
+                                        /**
+                                         * If the theme is using a custom front, create
+                                         * an activity nav if the blog is public
+                                         */
+                                        if ( $this->current_blog->front_template && bp_is_active( 'activity' ) && bp_current_blog_is_public() ) {
+                                                $main_nav_items[] = array(
+                                                        'name'                => _x( 'Activity', 'Single Blog activity screen nav', 'buddypress' ),
+                                                        'slug'                => 'activity',
+                                                        'position'            => 10,
+                                                        'screen_function'     => 'bp_blogs_screen_blog_home',
+                                                        'default_subnav_slug' => false,
+                                                        'item_css_id'         => 'all',
+                                                        'single_nav'          => $this->id,
+                                                );
+                                        }
+                                }
+
+                                if ( bp_is_item_admin() ) {
+                                        // Manage Main nav
+                                        $main_nav_items[] = array(
+                                                'name'                => _x( 'Manage', 'Single Blog manage screen nav', 'buddypress' ),
+                                                'slug'                => 'manage',
+                                                'position'            => 1000,
+                                                'screen_function'     => 'bp_blogs_screen_blog_settings',
+                                                'default_subnav_slug' => 'manage',
+                                                'single_nav'          => $this->id,
+                                        );
+                                }
+                        }
+
+                        /**
+                         * Use this filter if you want to add/remove nav items
+                         *
+                         * @since  BuddyPress (2.3.0)
+                         *
+                         * @param  array         $main_nav_items the current blog subnav items
+                         * @param  BP_Blogs_Blog $current_blog the current blog object
+                         */
+                        foreach ( (array) apply_filters( 'bp_blogs_current_blog_nav_items', $main_nav_items, $this->current_blog ) as $main_nav_item ) {
+                                bp_core_new_nav_item( $main_nav_item );
+                        }
 
-                // Setup navigation
-                parent::setup_nav( $main_nav, $sub_nav );
+                        /** Sub nav items - only manage needs some for now */
+
+                        $sub_nav_items = array();
+                        $blog_link     = trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/'. $this->current_blog->slug );
+
+                        if ( bp_is_item_admin() ) {
+
+                                /**
+                                 * General settings
+                                 *
+                                 * Edit the preferences for the current blog
+                                 * Access is restricted to The blog admins
+                                 */
+                                $sub_nav_items[] = array(
+                                        'name'            => _x( 'Edit Settings', 'Single Blog setting screen', 'buddypress' ),
+                                        'slug'            => 'manage',
+                                        'parent_url'      => trailingslashit( $blog_link . 'manage' ),
+                                        'parent_slug'     => 'manage',
+                                        'screen_function' => 'bp_blogs_screen_blog_settings',
+                                        'position'        => 0,
+                                        'user_has_access' => bp_is_item_admin(),
+                                        'single_subnav'   => $this->id,
+                                );
+
+                                /**
+                                 * Site logo
+                                 *
+                                 * Edit the logo for the current blog
+                                 * Access is restricted to The blog admins
+                                 */
+                                if ( bp_blogs_is_avatar_uploads_enabled() ) {
+                                        $sub_nav_items[] = array(
+                                                'name'            => _x( 'Edit Logo', 'Single Blog photo screen', 'buddypress' ),
+                                                'slug'            => 'edit-logo',
+                                                'parent_url'      => trailingslashit( $blog_link . 'manage' ),
+                                                'parent_slug'     => 'manage',
+                                                'screen_function' => 'bp_blogs_screen_blog_settings',
+                                                'position'        => 10,
+                                                'user_has_access' => bp_is_item_admin(),
+                                                'single_subnav'   => $this->id,
+                                        );
+                                }
+
+                                /**
+                                 * Manage members (remove)
+                                 */
+                                $sub_nav_items[] = array(
+                                        'name'            => _x( 'Members', 'Single Blog manage members screen', 'buddypress' ),
+                                        'slug'            => 'members',
+                                        'parent_url'      => trailingslashit( $blog_link . 'manage' ),
+                                        'parent_slug'     => 'manage',
+                                        'screen_function' => 'bp_blogs_screen_blog_settings',
+                                        'position'        => 20,
+                                        'user_has_access' => bp_is_item_admin(),
+                                        'single_subnav'   => $this->id,
+                                );
+                        }
+
+                        /**
+                         * Use this filter if you want to add/remove subnav items
+                         *
+                         * @since  BuddyPress (2.3.0)
+                         *
+                         * @param  array         $sub_nav_items the current blog subnav items
+                         * @param  BP_Blogs_Blog $current_blog the current blog object
+                         * @param  string        $blog_link the current blog view details link
+                         */
+                        foreach ( (array) apply_filters( 'bp_blogs_current_blog_subnav_items', $sub_nav_items, $this->current_blog, $blog_link ) as $sub_nav_item ) {
+                                bp_core_new_subnav_item( $sub_nav_item );
+                        }
+                }
         }
 
         /**
@@ -260 +511 @@
                                         $bp->bp_options_title = __( 'My Sites', 'buddypress' );
                                 }
 
+                        // We are viewing a single blog, so set up the
+                        // blog title tag using the $this->current_blog global.
+                        } elseif ( bp_is_single_item() ) {
+                                $bp->bp_options_title  = $this->current_blog->name;
+                                $bp->bp_options_avatar = bp_core_fetch_avatar( array(
+                                        'item_id'    => $this->current_blog->id,
+                                        'object'     => 'blog',
+                                        'type'       => 'thumb',
+                                        'avatar_dir' => 'blog-avatars',
+                                        'alt'        => __( 'Site logo', 'buddypress' )
+                                ) );
+
+                                if ( empty( $bp->bp_options_avatar ) ) {
+                                        $bp->bp_options_avatar = '<img src="' . esc_url( bp_core_avatar_default_thumb() ) . '" alt="' . esc_attr__( 'No Site logo', 'buddypress' ) . '" class="avatar" />';
+                                }
+
                         // If we are not viewing the logged in user, set up the current
                         // users avatar and name
                         } else {
@@ -284 +551 @@
 
                 // Global groups
                 wp_cache_add_global_groups( array(
-                        'blog_meta'
+                        'blog_meta',
+                        'bp_blogs'
                 ) );
 
                 parent::setup_cache_groups();
@@ -308 +576 @@
                 $params->admin_filter    = __( 'New post published', 'buddypress' );
                 $params->format_callback = 'bp_blogs_format_activity_action_new_blog_post';
                 $params->front_filter    = __( 'Posts', 'buddypress' );
-                $params->contexts        = array( 'activity', 'member' );
+                $params->contexts        = array( 'activity', 'member', 'blog', 'member_blogs' );
                 $params->position        = 5;
 
                 return $params;
         }
+
+        /**
+         * Sort the current blog's nav
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        public function sort_single_item_nav() {
+                bp_core_sort_nav_items( $this->id );
+                bp_core_sort_subnav_items( $this->id );
+        }
 }
 
 /**

src/bp-blogs/bp-blogs-notifications.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Blogs Notification Functions
+ *
+ * These functions handle the recording, deleting and formatting of notifications
+ * for the user and for this specific component.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsNotifications
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Notify Site admins about a new subscription.
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param int           $subscriber_id ID of the user who subscribed to a site.
+ * @param BP_Blogs_Blog $blog Blog object the user subscribed to
+ * @return bool|null False on failure.
+ */
+function bp_blogs_notification_new_subscription( $subscriber_id = 0, $blog = null ) {
+        if ( ! is_a( $blog, 'BP_Blogs_Blog' ) || empty( $subscriber_id ) ) {
+                return;
+        }
+
+        if ( empty( $blog->admins ) ) {
+                return;
+        }
+
+        // List of notified admins
+        $admin_notified = array();
+
+        foreach ( $blog->admins as $admin ) {
+
+                // Trigger a BuddyPress Notification
+                if ( bp_is_active( 'notifications' ) ) {
+                        bp_notifications_add_notification( array(
+                                'user_id'           => $admin->ID,
+                                'item_id'           => $blog->id,
+                                'secondary_item_id' => $subscriber_id,
+                                'component_name'    => buddypress()->blogs->id,
+                                'component_action'  => 'new_site_subscription'
+                        ) );
+                }
+
+                // Bail if member opted out of receiving this email
+                if ( 'no' === bp_get_user_meta( $admin->ID, 'notification_blogs_new_subscription', true ) ) {
+                        return false;
+                }
+
+                // Username of the subscriber: %1$s in mail
+                $subscriber_user_name = bp_core_get_user_displayname( $subscriber_id );
+
+                // Blog's Manage members page
+                $manage_members = trailingslashit( bp_get_blog_view_details_link() . 'manage/members' );
+
+                // Link to the user's profile who subscribed: %3$s in mail
+                $subscriber_profile_link = bp_core_get_user_domain( $subscriber_id );
+
+                $settings_slug  = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+                // Link to the site administrator email settings: %s in "disable notifications" part of the email
+                $settings_link  = bp_core_get_user_domain( $admin->ID ) . $settings_slug . '/notifications/';
+
+                // Set up and send the message
+                $to       = $admin->user_email;
+                $subject  = bp_get_email_subject( array( 'text' => sprintf( __( 'New subscription for the site: %s', 'buddypress' ), $blog->name ) ) );
+
+                $message = sprintf( __(
+'%1$s subscribed to the site "%2$s".
+
+Because you are the administrator of this site, you are receiving this notifications.
+
+To manage the members of your site, please visit:
+%3$s
+
+To view %4$s\'s profile: %5$s
+
+---------------------
+', 'buddypress' ), $subscriber_user_name, $blog->name, $manage_members, $subscriber_user_name, $subscriber_profile_link );
+
+                // Only show the disable notifications line if the settings component is enabled
+                if ( bp_is_active( 'settings' ) ) {
+                        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+                }
+
+                /**
+                 * Filters the user email that the site subscription notification will be sent to.
+                 *
+                 * @since BuddyPress (2.3.0)
+                 *
+                 * @param string $to User email the notification is being sent to.
+                 */
+                $to = apply_filters( 'bp_blogs_notification_new_site_subscription_to', $to );
+
+                /**
+                 * Filters the site subscription email subject that will be sent to user.
+                 *
+                 * @since BuddyPress (2.3.0)
+                 *
+                 * @param string          $subject site subscription email subject text.
+                 * @param BP_Blogs_Blog   $blog    Object holding the current blog instance. Passed by reference.
+                 */
+                $subject = apply_filters_ref_array( 'bp_blogs_notification_new_site_subscription_subject', array( $subject, $blog ) );
+
+                /**
+                 * Filters the site subscription notification message that will be sent to user.
+                 *
+                 * @since BuddyPress (2.3.0)
+                 *
+                 * @param string          $message                 Email message text.
+                 * @param BP_Blogs_Blog   $blog                    Object holding the current blog instance. Passed by reference.
+                 * @param string          $subscriber_user_name    Username of who subscribed.
+                 * @param string          $subscriber_profile_link URL permalink for the profile for the user requesting membership.
+                 * @param string          $manage_members          URL permalink for the Blog's Manage members page
+                 * @param string          $settings_link           URL permalink for the user's notification settings area.
+                 */
+                $message = apply_filters_ref_array( 'bp_blogs_notification_new_site_subscription_message', array( $message, $blog, $subscriber_user_name, $subscriber_profile_link, $manage_members, $settings_link ) );
+
+                if ( wp_mail( $to, $subject, $message ) ) {
+                        $admin_notified[] = $admin;
+                }
+        }
+
+        /**
+         * Fires after the notification is sent that a member subscribed to a site.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param array  $admin_notified     list of Admin objects (ID, display name, user_login, user_nicename, user_email)
+         *                                   who were notified
+         * @param string $subject            Email notification subject text.
+         * @param string $message            Email notification message text.
+         * @param int    $subscriber_id      ID of the user who subscribed.
+         * @param BP_Blogs_Blog   $blog      Object holding the current blog instance. Passed by reference.
+         */
+        do_action( 'bp_blogs_sent_membership_request_email', $admin_notified, $subject, $message, $subscriber_id, $blog );
+}
+add_action( 'bp_blogs_joined_blog', 'bp_blogs_notification_new_subscription', 10, 2 );
+
+/**
+ * Format notifications for the Blogs component.
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param string $action The kind of notification being rendered.
+ * @param int $item_id The primary item ID.
+ * @param int $secondary_item_id The secondary item ID.
+ * @param int $total_items The total number of messaging-related notifications
+ *        waiting for the user.
+ * @param string $format 'string' for BuddyBar-compatible notifications; 'array'
+ *        for WP Toolbar. Default: 'string'.
+ * @return string
+ */
+function bp_blogs_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {
+
+        switch ( $action ) {
+                case 'new_site_subscription':
+                        $blog_id       = $item_id;
+                        $subscriber_id = $secondary_item_id;
+                        $amount        = 'single';
+
+                        // Set up the string and the filter
+                        // Because different values are passed to the filters, we'll return the
+                        // values inline
+                        if ( (int) $total_items > 1 ) {
+                                $text = sprintf( __( '%d new site subscriptions', 'buddypress' ), (int) $total_items );
+                                $amount = 'multiple';
+                                $notification_link = trailingslashit( bp_loggedin_user_domain() . bp_get_blogs_slug() ) . '?n=1';;
+
+                                if ( 'string' == $format ) {
+
+                                        /**
+                                         * Filters blogs multiple new subscription notification for string format.
+                                         *
+                                         * This is a dynamic filter that is dependent on item count and action.
+                                         * Complete filter - bp_blogs_multiple_new_site_subscriptions_notification.
+                                         *
+                                         * @since BuddyPress (2.3.0)
+                                         *
+                                         * @param string $string            HTML anchor tag for request.
+                                         * @param int    $total_items       Total number of membership requests.
+                                         * @param string $text              Notification content.
+                                         * @param string $notification_link The permalink for notification.
+                                         */
+                                        return apply_filters( 'bp_blogs_' . $amount . '_' . $action . 's_notification', '<a href="' . $notification_link . '" title="' . __( 'Site Subscriptions', 'buddypress' ) . '">' . $text . '</a>', $total_items, $text, $notification_link );
+                                } else {
+
+                                        /**
+                                         * Filters blogs multiple new subscription notification for any non-string format.
+                                         *
+                                         * This is a dynamic filter that is dependent on item count and action.
+                                         * Complete filter - bp_blogs_multiple_new_site_subscriptions_notification.
+                                         *
+                                         * @since BuddyPress (2.3.0)
+                                         *
+                                         * @param array  $array             Array holding permalink and content for notification.
+                                         * @param int    $total_items       Total number of membership requests.
+                                         * @param string $text              Notification content.
+                                         * @param string $notification_link The permalink for notification.
+                                         */
+                                        return apply_filters( 'bp_blogs_' . $amount . '_' . $action . 's_notification', array(
+                                                'link' => $notification_link,
+                                                'text' => $text
+                                        ), $total_items, $text, $notification_link );
+                                }
+                        } else {
+                                // Avoid switching blogs
+                                $blog         = get_blog_details( (int) $blog_id, false );
+                                $current_site = get_current_site();
+
+                                if ( (int) $current_site->id === (int) $blog_id ) {
+                                        $slug = apply_filters( 'bp_blogs_get_site_slug', 'root' );
+                                } else {
+                                        $slug = trim( str_replace( $current_site->path, '', $blog->path ), '/' );
+                                }
+
+                                $blog_link         = trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/' . $slug );
+                                $blog_name         = bp_blogs_get_blogmeta( $blog_id, 'name' );
+                                $user_fullname     = bp_core_get_user_displayname( $subscriber_id );
+                                $text              = sprintf( __( '%1$s subscribed to the site "%2$s"', 'buddypress' ), $user_fullname, $blog_name );
+                                $notification_link = $blog_link . 'manage/members/?n=1';
+
+                                if ( 'string' == $format ) {
+
+                                        /**
+                                         * Filters blogs single new subscription notification for string format.
+                                         *
+                                         * This is a dynamic filter that is dependent on item count and action.
+                                         * Complete filter - bp_blogs_single_new_site_subscription_notification.
+                                         *
+                                         * @since BuddyPress (2.3.0)
+                                         *
+                                         * @param string $string            HTML anchor tag for request.
+                                         * @param string $blog_link         The permalink for the blog.
+                                         * @param string $user_fullname     Full name of requesting user.
+                                         * @param string $blog_name         Name of the blog.
+                                         * @param string $text              Notification content.
+                                         * @param string $notification_link The permalink for notification.
+                                         */
+                                        return apply_filters( 'bp_blogs_' . $amount . '_' . $action . '_notification', '<a href="' . $notification_link . '" title="' . sprintf( __( '%1$s subscribed to the site "%2$s"', 'buddypress' ), $user_fullname, $blog_name ) . '">' . $text . '</a>', $blog_link, $user_fullname, $blog_name, $text, $notification_link );
+                                } else {
+
+                                        /**
+                                         * Filters blogs single new subscription notification for any non-string format.
+                                         *
+                                         * This is a dynamic filter that is dependent on item count and action.
+                                         * Complete filter - bp_blogs_single_new_site_subscription_notification.
+                                         *
+                                         * @since BuddyPress (2.3.0)
+                                         *
+                                         * @param array  $array             Array holding permalink and content for notification.
+                                         * @param string $blog_link         The permalink for the blog.
+                                         * @param string $user_fullname     Full name of requesting user.
+                                         * @param string $blog_name         Name of the blog.
+                                         * @param string $text              Notification content.
+                                         * @param string $notification_link The permalink for notification.
+                                         */
+                                        return apply_filters( 'bp_blogs_' . $amount . '_' . $action . '_notification', array(
+                                                'link' => $notification_link,
+                                                'text' => $text
+                                        ), $blog_link, $user_fullname, $blog_name, $text, $notification_link );
+                                }
+                        }
+
+                        break;
+        }
+
+        /**
+         * Fires right before returning the formatted blog notifications.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param string $action            The type of notification being rendered.
+         * @param int    $item_id           The primary item ID.
+         * @param int    $secondary_item_id The secondary item ID.
+         * @param int    $total_items       Total amount of items to format.
+         */
+        do_action( 'bp_blogs_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
+
+        return false;
+}
+
+/**
+ * Mark notifications read when a member views their blogs.
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_screen_my_blogs_mark_notifications() {
+
+        // Delete blog subscriptions for the user
+        if ( isset( $_GET['n'] ) && bp_is_active( 'notifications' ) ) {
+
+                // Get the necessary ID's
+                $component_id = buddypress()->blogs->id;
+                $user_id      = bp_loggedin_user_id();
+
+                // Mark notifications read
+                bp_notifications_mark_notifications_by_type( $user_id, $component_id, 'new_site_subscription' );
+        }
+}
+add_action( 'bp_blogs_screen_my_blogs',  'bp_blogs_screen_my_blogs_mark_notifications', 10 );
+
+
+/**
+ * Mark notifications read when a member views the manage members screen of his site.
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_screen_manage_blog_members_mark_notifications() {
+
+        // Delete blog subscriptions for the user
+        if ( isset( $_GET['n'] ) && bp_is_active( 'notifications' ) ) {
+                bp_notifications_mark_notifications_by_item_id( bp_loggedin_user_id(), bp_get_current_blog_id(), buddypress()->blogs->id, 'new_site_subscription' );
+        }
+}
+add_action( 'blogs_screen_blog_settings',  'bp_blogs_screen_manage_blog_members_mark_notifications', 10 );
+
+/**
+ * Delete notifications generated by a user who has been removed from the blog.
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_clean_notification_on_user_removed( $user_id = 0, $blog_id = 0 ) {
+        if ( bp_is_active( 'notifications' ) && ! empty( $user_id ) && ! empty( $blog_id ) ) {
+                bp_notifications_delete_notifications_by_item_id( false, $blog_id, buddypress()->blogs->id, 'new_site_subscription', $user_id );
+        }
+}
+add_action( 'bp_blogs_remove_blog_for_user', 'bp_blogs_clean_notification_on_user_removed', 10, 2 );
+
+/**
+ * Delete all notifications about a blog who was removed.
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_clean_all_notifications_for_blog( $blog_id = 0 ) {
+        if ( bp_is_active( 'notifications' ) && ! empty( $blog_id ) ) {
+                bp_notifications_delete_all_notifications_by_type( $blog_id, buddypress()->blogs->id );
+        }
+}
+add_action( 'bp_blogs_remove_blog', 'bp_blogs_clean_all_notifications_for_blog', 10, 1 );

src/bp-blogs/bp-blogs-screens.php

@@ -68 +68 @@
 }
 add_action( 'bp_screens', 'bp_blogs_screen_index', 2 );
 
+/**
+ * Home screen for the blogs single item
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_screen_blog_home() {
+        if ( ! bp_is_single_item() ) {
+                return false;
+        }
+
+        do_action( 'bp_blogs_screen_blog_home' );
+
+        if ( ! empty( $_GET['action'] ) && ( 'join' === $_GET['action'] || 'leave' === $_GET['action'] ) ) {
+                $action = sanitize_key( $_GET['action'] );
+
+                check_admin_referer( 'blogs_' . $action . '_blog' );
+
+                $referer = wp_get_referer();
+                $result = array(
+                        'message' => __( 'We were not able to perform this action, please try again later', 'bp-blogs-extended' ),
+                        'type'    => 'error',
+                );
+
+                if ( is_user_logged_in() && is_callable( 'bp_blogs_' . $action . '_blog' ) ) {
+                        $result = call_user_func( 'bp_blogs_' . $action . '_blog' );
+                }
+
+                bp_core_add_message( $result['message'], $result['type'] );
+                bp_core_redirect( $referer );
+        }
+
+        bp_core_load_template( apply_filters( 'bp_blogs_template_blog_home', 'blogs/single/home' ) );
+}
+
+/**
+ * Settings screen for the blogs single item
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_screen_blog_settings() {
+        if ( ! bp_is_single_item() ) {
+                return false;
+        }
+
+        do_action( 'blogs_screen_blog_settings' );
+
+        if ( bp_is_blog_manage() && ! bp_action_variables( 0 ) && ! empty( $_POST['bp_blog']['submit'] ) ) {
+
+                check_admin_referer( 'blog_settings_general' );
+
+                unset( $_POST['bp_blog']['submit'] );
+                $options = $_POST['bp_blog'];
+
+                if ( ! isset( $options['blog_public'] ) ) {
+                        $options['blog_public'] = 0;
+                }
+
+                $blog_id = bp_get_current_blog_id();
+                $referer = wp_unslash( $_POST['_wp_http_referer'] );
+                $message = __( 'We were not able to perform this action, please try again later', 'buddypress' );
+
+                if ( empty( $blog_id ) ) {
+                        bp_core_add_message( $message, 'error' );
+                        bp_core_redirect( $referer );
+                }
+
+                $success = 'error';
+
+                // Update general settings
+                if ( bp_get_root_blog_id() !== $blog_id ) {
+                        $needs_reset = true;
+                        switch_to_blog( $blog_id );
+                }
+
+                if ( current_user_can( 'manage_options' ) ) {
+
+                        // This option will only be saved in BuddyPress blog metas
+                        if ( isset( $options['disallow_subscriptions'] ) ) {
+                                bp_blogs_update_blogmeta( $blog_id, 'disallow_subscriptions', intval( $options['disallow_subscriptions'] ) );
+                                unset( $options['disallow_subscriptions'] );
+                        } else {
+                                bp_blogs_delete_blogmeta( $blog_id, 'disallow_subscriptions' );
+                        }
+
+                        foreach ( $options as $key => $option ) {
+                                $sanitized_option = sanitize_option( $key, $option );
+
+                                update_option( $key, $sanitized_option );
+                        }
+                        $message = __( 'Settings saved.', 'buddypress' );
+                        $success = '';
+
+                } else {
+                        $message = __( 'You cannot update this site's options.', 'buddypress' );
+                }
+
+                if ( isset( $needs_reset ) ) {
+                        restore_current_blog();
+                }
+
+                // Redirect the user once done
+                bp_core_add_message( $message, $success );
+                bp_core_redirect( $referer );
+        }
+
+        if ( bp_is_blog_manage_screen( 'members' ) && isset( $_GET['remove_member'] ) ) {
+
+                check_admin_referer( 'blogs_remove_member' );
+
+                $blog_id = bp_get_current_blog_id();
+                $user_id = intval( $_GET['remove_member'] );
+                $referer = wp_get_referer();
+                $message = __( 'We were not able to perform this action, please try again later', 'buddypress' );
+                $type    = 'error';
+
+                if ( ! bp_is_item_admin() || empty( $blog_id ) || empty( $user_id ) ) {
+                        bp_core_add_message( $message, $type );
+                        bp_core_redirect( $referer );
+                }
+
+                /**
+                 * Fires bofore the user is removed from the blog
+                 */
+                do_action( 'bp_blogs_before_remove_user_from_blog', $user_id, $blog_id );
+
+                /**
+                 * bp_blogs_remove_user_from_blog() will hook WordPress to remove
+                 * the link between the user and the blog
+                 */
+                $removed = remove_user_from_blog( $user_id, $blog_id );
+
+                if ( is_wp_error( $removed ) ) {
+                        $message = $removed->get_error_message();
+                } else {
+                        $message = __( 'Member successfully removed from the site.', 'buddypress' );
+                        $type    = 'success';
+
+                        bp_blogs_delete_activity( array(
+                                'user_id' => $user_id,
+                                'item_id' => $blog_id,
+                                'type'    => 'site_subscription',
+                        ) );
+
+                        /**
+                         * Fires after the user was removed from the blog
+                         */
+                        do_action( 'bp_blogs_user_removed_from_blog', $user_id, $blog_id );
+
+                        bp_core_add_message( $message, $type );
+                        bp_core_redirect( $referer );
+                }
+        }
+
+        bp_core_load_template( apply_filters( 'bp_blogs_template_blog_settings', 'blogs/single/home' ) );
+}
+
+/**
+ * Render the blogs settings fields on the Notification Settings page.
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_screen_notification_settings() {
+
+        $new_subscription = bp_get_user_meta( bp_displayed_user_id(), 'notification_blogs_new_subscription', true );
+
+        // Defaults to yes
+        if ( ! $new_subscription ) {
+                $new_subscription  = 'yes';
+        }
+        ; ?>
+
+        <table class="notification-settings" id="groups-notification-settings">
+                <thead>
+                        <tr>
+                                <th class="icon"></th>
+                                <th class="title"><?php _ex( 'Sites', 'Sites settings on notification settings page', 'buddypress' ) ?></th>
+                                <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+                                <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+                        </tr>
+                </thead>
+
+                <tbody>
+                        <tr id="blogs-notification-settings-subscription">
+                                <td></td>
+                                <td><?php _ex( 'A member subscribe to a site you are an administrator of', 'Sites settings on notification settings page','buddypress' ) ?></td>
+                                <td class="yes"><input type="radio" name="notifications[notification_blogs_new_subscription]" value="yes" <?php checked( $new_subscription, 'yes', true ) ?>/></td>
+                                <td class="no"><input type="radio" name="notifications[notification_blogs_new_subscription]" value="no" <?php checked( $new_subscription, 'no', true ) ?>/></td>
+                        </tr>
+
+                        <?php
+
+                        /**
+                         * Fires at the end of the available group settings fields on Notification Settings page.
+                         *
+                         * @since BuddyPress (1.0.0)
+                         */
+                        do_action( 'bp_blogs_screen_notification_settings' ); ?>
+
+                </tbody>
+        </table>
+
+<?php
+}
+add_action( 'bp_notification_settings', 'bp_blogs_screen_notification_settings', 20 );
+
 /** Theme Compatibility *******************************************************/
 
 /**
  * The main theme compat class for BuddyPress Blogs
  *
  * This class sets up the necessary theme compatibility actions to safely output
- * group template parts to the_title and the_content areas of a theme.
+ * blog template parts to the_title and the_content areas of a theme.
  *
  * @since BuddyPress (1.7.0)
  */
@@ -96 +301 @@
          */
         public function is_blogs() {
 
-                // Bail if not looking at a group
+                // Bail if not looking at a blog
                 if ( ! bp_is_blogs_component() )
                         return;
 
@@ -105 +310 @@
                         return;
 
                 // Blog Directory
-                if ( is_multisite() && ! bp_current_action() ) {
+                if ( is_multisite() && ! bp_current_action() && ! bp_current_item() ) {
                         bp_update_is_directory( true, 'blogs' );
 
                         /**
@@ -121 +326 @@
                         add_filter( 'bp_replace_the_content',                    array( $this, 'directory_content'    ) );
 
                 // Create blog
-                } elseif ( is_user_logged_in() && bp_blog_signup_enabled() ) {
+                } elseif ( is_user_logged_in() && bp_blog_signup_enabled() && bp_is_create_blog() ) {
                         add_filter( 'bp_get_buddypress_template',                array( $this, 'create_template_hierarchy' ) );
                         add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'create_dummy_post' ) );
                         add_filter( 'bp_replace_the_content',                    array( $this, 'create_content'    ) );
+                } elseif ( bp_is_single_item() ) {
+                        add_filter( 'bp_get_buddypress_template',                array( $this, 'single_template_hierarchy' ) );
+                        add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'single_dummy_post' ) );
+                        add_filter( 'bp_replace_the_content',                    array( $this, 'single_content'    ) );
                 }
         }
 
@@ -183 +392 @@
         }
 
         /**
-         * Filter the_content with the groups index template part.
+         * Filter the_content with the blogs index template part.
          *
          * @since BuddyPress (1.7.0)
          */
@@ -260 +469 @@
         public function create_content() {
                 return bp_buffer_template_part( 'blogs/create', null, false );
         }
+
+        /** Single ************************************************************/
+
+        /**
+         * Add custom template hierarchy to theme compat for blog pages.
+         *
+         * This is to mirror how WordPress has
+         * {@link https://codex.wordpress.org/Template_Hierarchy template hierarchy}.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param string $templates The templates from bp_get_theme_compat_templates().
+         * @return array $templates Array of custom templates to look for.
+         */
+        public function single_template_hierarchy( $templates ) {
+                // Setup some variables we're going to reference in our custom templates
+                $blog = bp_blogs_get_current_blog();
+
+                /**
+                 * Filters the Blogs single pages template hierarchy based on priority.
+                 *
+                 * @since BuddyPress (2.3.0)
+                 *
+                 * @param array $value Array of default template files to use.
+                 */
+                $new_templates = apply_filters( 'bp_template_hierarchy_blogs_single_item', array(
+                        'blogs/single/index-id-'     . sanitize_file_name( $blog->id )           . '.php',
+                        'blogs/single/index-slug-'   . sanitize_file_name( $blog->slug )         . '.php',
+                        'blogs/single/index-action-' . sanitize_file_name( bp_current_action() ) . '.php',
+                        'blogs/single/index.php'
+                ) );
+
+                // Merge new templates with existing stack
+                // @see bp_get_theme_compat_templates()
+                $templates = array_merge( (array) $new_templates, $templates );
+
+                return $templates;
+        }
+
+        /**
+         * Update the global $post with single blog data.
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        public function single_dummy_post() {
+                bp_theme_compat_reset_post( array(
+                        'ID'             => 0,
+                        'post_title'     => bp_get_current_blog_name(),
+                        'post_author'    => 0,
+                        'post_date'      => 0,
+                        'post_content'   => '',
+                        'post_type'      => 'page',
+                        'post_status'    => 'publish',
+                        'is_page'        => true,
+                        'comment_status' => 'closed'
+                ) );
+        }
+
+        /**
+         * Filter the_content with the single blog template part.
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        public function single_content() {
+                return bp_buffer_template_part( 'blogs/single/home', null, false );
+        }
 }
 new BP_Blogs_Theme_Compat();

src/bp-blogs/bp-blogs-template.php

@@ -197 +197 @@
          *        queried blogs.
          * @param array $include_blog_ids Array of blog IDs to include.
          */
-        public function __construct( $type, $page, $per_page, $max, $user_id, $search_terms, $page_arg = 'bpage', $update_meta_cache = true, $include_blog_ids = false ) {
+        public function __construct( $type, $page, $per_page, $max, $user_id, $search_terms, $page_arg = 'bpage', $update_meta_cache = true, $include_blog_ids = false, $slug = '' ) {
 
                 $this->pag_arg  = sanitize_key( $page_arg );
                 $this->pag_page = bp_sanitize_pagination_arg( $this->pag_arg, $page     );
                 $this->pag_num  = bp_sanitize_pagination_arg( 'num',          $per_page );
 
+                // A blog item is requested
+                if ( 'single-blog' === $type ) {
+                        if ( bp_blogs_get_current_blog() ) {
+                                $blog = bp_blogs_get_current_blog();
+
+                        } else {
+                                $blog = bp_blogs_get_blog( array(
+                                        'blog_id' => get_id_from_blogname( $slug ),
+                                ) );
+                        }
+
+                        $this->blogs = array( $blog );
+
                 // Backwards compatibility support for blogs by first letter
-                if ( ! empty( $_REQUEST['letter'] ) ) {
+                } elseif ( ! empty( $_REQUEST['letter'] ) ) {
                         $this->blogs = BP_Blogs_Blog::get_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page );
 
                 // Typical blogs query
@@ -220 +233 @@
                         ) );
                 }
 
-                // Set the total blog count
-                if ( empty( $max ) || ( $max >= (int) $this->blogs['total'] ) ) {
-                        $this->total_blog_count = (int) $this->blogs['total'];
+                if ( 'single-blog' === $type ) {
+                        if ( empty( $blog->id ) ) {
+                                $this->total_blog_count = 0;
+                                $this->blog_count       = 0;
+                        } else {
+                                $this->total_blog_count = 1;
+                                $this->blog_count       = 1;
+                        }
+
                 } else {
-                        $this->total_blog_count = (int) $max;
-                }
+                        // Set the total blog count
+                        if ( empty( $max ) || ( $max >= (int) $this->blogs['total'] ) ) {
+                                $this->total_blog_count = (int) $this->blogs['total'];
+                        } else {
+                                $this->total_blog_count = (int) $max;
+                        }
 
-                // Set the blogs array (to loop through later
-                $this->blogs = $this->blogs['blogs'];
+                        // Set the blogs array (to loop through later
+                        $this->blogs = $this->blogs['blogs'];
 
-                // Get the current blog count to compare maximum against
-                $blog_count = count( $this->blogs );
+                        // Get the current blog count to compare maximum against
+                        $blog_count = count( $this->blogs );
 
-                // Set the current blog count
-                if ( empty( $max ) || ( $max >= (int) $blog_count ) ) {
-                        $this->blog_count = (int) $blog_count;
-                } else {
-                        $this->blog_count = (int) $max;
+                        // Set the current blog count
+                        if ( empty( $max ) || ( $max >= (int) $blog_count ) ) {
+                                $this->blog_count = (int) $blog_count;
+                        } else {
+                                $this->blog_count = (int) $max;
+                        }
                 }
 
                 // Build pagination links based on total blogs and current page number
@@ -395 +419 @@
 function bp_has_blogs( $args = '' ) {
         global $blogs_template;
 
+        $type         = 'active';
+        $slug         = '';
+        $current_blog = bp_blogs_get_current_blog();
+
+        if ( bp_get_current_blog_slug() ) {
+                $type = 'single-blog';
+                $slug = bp_get_current_blog_slug();
+        }
+
+
         // Check for and use search terms
         $search_terms = ! empty( $_REQUEST['s'] )
                 ? $_REQUEST['s']
@@ -402 +436 @@
 
         // Parse arguments
         $r = bp_parse_args( $args, array(
-                'type'              => 'active',
+                'type'              => $type,
                 'page_arg'          => 'bpage',                // See https://buddypress.trac.wordpress.org/ticket/3679
                 'page'              => 1,
                 'per_page'          => 20,
@@ -410 +444 @@
                 'user_id'           => bp_displayed_user_id(), // Pass a user_id to limit to only blogs this user is a member of
                 'include_blog_ids'  => false,
                 'search_terms'      => $search_terms,          // Pass search terms to filter on the blog title or description.
-                'update_meta_cache' => true
+                'update_meta_cache' => true,
+                'slug'              => $slug                   // Pass the slug of the blog in conjonction with a type set to 'single-blog'
         ), 'has_blogs' );
 
         // Set per_page to maximum if max is enforced
@@ -419 +454 @@
         }
 
         // Get the blogs
-        $blogs_template = new BP_Blogs_Template( $r['type'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['search_terms'], $r['page_arg'], $r['update_meta_cache'], $r['include_blog_ids'] );
+        $blogs_template = new BP_Blogs_Template( $r['type'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['search_terms'], $r['page_arg'], $r['update_meta_cache'], $r['include_blog_ids'], $r['slug'] );
 
         /**
          * Filters whether or not there are blogs to list.
@@ -555 +590 @@
                         'type'    => 'full',
                         'width'   => false,
                         'height'  => false,
-                        'class'   => 'avatar',
+                        'class'   => 'avatar blog-' . $blogs_template->blog->blog_id . '-avatar',
                         'id'      => false,
                         'alt'     => sprintf( __( 'Profile picture of site author %s', 'buddypress' ), bp_core_get_user_displayname( $blogs_template->blog->admin_user_id ) ),
                         'no_grav' => true,
                 ) );
 
+                /**
+                 * If the Blogs single items are allowed, as people can subscribe to
+                 * sites, when a subsriber looks at my sites, he can see his avatar
+                 * for a site he's not an admin off. That's because BP_Blogs_Blog::get()
+                 * is not really getting the admin of a blog but any member linked to it
+                 * in the bp_user_blogs table.
+                 *
+                 * So as Blogs can now set avatars, let's use the mystery man to avoid
+                 * some confusions..
+                 */
+                if ( ! bp_blogs_disable_single_items() ) {
+                        $object     = 'blog';
+                        $avatar_dir = 'blog-avatars';
+                        $item_id    = $blogs_template->blog->blog_id;
+                        $title      = $blogs_template->blog->name;
+                        $r['class'] = 'avatar';
+                        $r['alt']   = sprintf( __( 'Site logo of %s', 'buddypress' ), $blogs_template->blog->name );
+
+                } else {
+                        // Defaults to the admin avatar
+                        $item_id    = $blogs_template->blog->admin_user_id;
+                        $title      = $blogs_template->blog->admin_user_email;
+                        $object     = 'user';
+                        $avatar_dir = 'avatars';
+                }
+
                 // Fetch the avatar
                 $avatar = bp_core_fetch_avatar( array(
-                        'item_id'    => $blogs_template->blog->admin_user_id,
-                        'title'      => $blogs_template->blog->admin_user_email,
-                        //'avatar_dir' => 'blog-avatars',
-                        //'object'     => 'blog',
+                        'item_id'    => $item_id,
+                        'title'      => $title,
+                        'avatar_dir' => $avatar_dir,
+                        'object'     => $object,
                         'type'       => $r['type'],
                         'alt'        => $r['alt'],
                         'css_id'     => $r['id'],
@@ -575 +636 @@
                         'height'     => $r['height']
                 ) );
 
-                /***
-                 * In future BuddyPress versions you will be able to set the avatar for a blog.
-                 * Right now you can use a filter with the ID of the blog to change it if you wish.
-                 * By default it will return the avatar for the primary blog admin.
-                 *
-                 * This filter is deprecated as of BuddyPress 1.5 and may be removed in a future version.
-                 * Use the 'bp_get_blog_avatar' filter instead.
-                 */
-                $avatar = apply_filters( 'bp_get_blog_avatar_' . $blogs_template->blog->blog_id, $avatar );
-
                 /**
                  * Filters a blog's avatar.
                  *
@@ -598 +649 @@
                 return apply_filters( 'bp_get_blog_avatar', $avatar, $blogs_template->blog->blog_id, $r );
         }
 
+/**
+ * Output the link to the single blog item
+ *
+ * @since  BuddyPress (2.3.0)
+ */
+function bp_blog_view_details_link() {
+        echo bp_get_blog_view_details_link();
+}
+
+        /**
+         * Return the link to the single blog item
+         *
+         * @since  BuddyPress (2.3.0)
+         *
+         * @param  object $blog the blog to get the view details link for
+         * @return string the  link to the blog's single item
+         */
+        function bp_get_blog_view_details_link() {
+                global $blogs_template;
+                $slug = false;
+
+                if ( isset( $blogs_template->blog ) ) {
+                        $blog = $blogs_template->blog;
+                } else {
+                        $blog = bp_blogs_get_current_blog();
+                }
+
+                if ( isset( $blog->slug ) ) {
+                        $slug = $blog->slug;
+                } elseif ( isset( $blog->path ) ) {
+                        if ( (int) get_current_site()->id === (int) $blog->blog_id ) {
+                                $slug = apply_filters( 'bp_blogs_get_site_slug', 'root' );
+                        } else {
+                                $slug = trim( str_replace( get_current_site()->path, '', $blog->path ), '/' );
+                        }
+                }
+
+                $view_details_link = trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/' . $slug );
+
+                /**
+                 * Filters the blog view details link.
+                 *
+                 * @since BuddyPress (2.3.0)
+                 *
+                 * @param string $view_details_link Permalink URL to the profile of the blog.
+                 */
+                return apply_filters( 'bp_get_blog_view_details_link', $view_details_link );
+        }
+
 function bp_blog_permalink() {
         echo bp_get_blog_permalink();
 }
         function bp_get_blog_permalink() {
                 global $blogs_template;
 
-                if ( empty( $blogs_template->blog->domain ) )
+                if ( empty( $blogs_template->blog->domain ) ) {
                         $permalink = bp_get_root_domain() . $blogs_template->blog->path;
-                else {
+                } else {
                         $protocol = 'http://';
                         if ( is_ssl() )
                                 $protocol = 'https://';
@@ -1108 +1208 @@
         }
         add_filter( 'bp_get_total_blog_count_for_user', 'bp_core_number_format' );
 
+/**
+ * Prints a message if the user has no access to the blog's content
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @global BP_Blogs_Template $blogs_template Blogs template object
+ * @param object $blog Blog to get status message for. Optional; defaults to current blog.
+ */
+function bp_blog_status_message( $blog = null ) {
+        global $blogs_template;
+
+        // Blog not passed so look for loop
+        if ( empty( $blog ) ) {
+                $blog =& $blogs_template->blog;
+        }
+
+        $message = false;
+
+        // For now display a message if the blog is not public
+        if ( empty( $blog->blog_public ) ) {
+                $message = __( 'The details of this site are restricted to its members.', 'buddypress' );
+        }
+
+        /**
+         * Filters a message if the blog is not public.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param string $message Message to display to the current user.
+         * @param object $blog   Blog to get status message for.
+         */
+        echo apply_filters( 'bp_blog_status_message', $message, $blog );
+}
 
 /** Blog Registration ********************************************************/
 
@@ -1371 +1504 @@
                 <?php printf(__( '<a href="%1$s">%2$s</a> is your new site.  <a href="%3$s">Login</a> as "%4$s" using your existing password.', 'buddypress' ), $blog_url, $blog_url, $blog_url . "wp-login.php", $user_name ); ?>
         </p>
 
-<?php
+        <?php if ( bp_blogs_is_avatar_uploads_enabled() && is_user_logged_in() ) :
+                $slug = trim( str_replace( get_current_site()->path, '', $path ), '/' );
+                $single_blog_link = trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/' .  $slug . '/manage/edit-logo' );
+        ?>
+                <p>
+                        <?php printf( __( 'You can also set a site logo for your site at any time from this <a href="%s">page</a>.', 'buddypress' ), $single_blog_link ); ?>
+                </p>
+
+        <?php endif;
 
         /**
          * Fires after the default successful blog registration message markup.
@@ -1554 +1695 @@
 add_action( 'bp_blogs_directory_blog_types', 'bp_blog_backcompat_create_nav_item', 1000 );
 
 /**
+ * Output button to view the blogs single item details.
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @see bp_get_blogs_view_details_blog_button() for description of arguments.
+ *
+ * @param array $args See {@link bp_get_blogs_view_details_blog_button()}.
+ */
+function bp_blogs_view_details_blog_button( $args = '' ) {
+        echo bp_get_blogs_view_details_blog_button( $args );
+}
+add_action( 'bp_directory_blogs_actions', 'bp_blogs_view_details_blog_button' );
+
+        /**
+         * Return button for viewing the blogs single item details.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @see BP_Button for a complete description of arguments and return
+         *      value.
+         *
+         * @param array $args {
+         *     Arguments are listed below, with their default values. For a
+         *     complete description of arguments, see {@link BP_Button}.
+         *     @type string $id Default: 'view_blog_profile'.
+         *     @type string $component Default: 'blogs'.
+         *     @type bool $must_be_logged_in Default: false.
+         *     @type bool $block_self Default: false.
+         *     @type string $wrapper_class Default: 'blog-button profile'.
+         *     @type string $link_href View details link of the current blog in the loop.
+         *     @type string $link_class Default: 'blog-button profile'.
+         *     @type string $link_text Default: 'View Details'.
+         *     @type string $link_title Default: 'View Details'.
+         * }
+         * @return string The HTML for the Visit button.
+         */
+        function bp_get_blogs_view_details_blog_button( $args = '' ) {
+                // Do not display the button if the single blog feature is disabled
+                if ( bp_blogs_disable_single_items() ) {
+                        return;
+                }
+
+                $button = wp_parse_args( $args, array(
+                        'id'                => 'view_blog_profile',
+                        'component'         => 'blogs',
+                        'must_be_logged_in' => false,
+                        'block_self'        => false,
+                        'wrapper_class'     => 'blog-button profile',
+                        'link_href'         => esc_url( bp_get_blog_view_details_link() ),
+                        'link_class'        => 'blog-button profile',
+                        'link_text'         => __( 'View Details', 'buddypress' ),
+                        'link_title'        => __( 'View Details', 'buddypress' ),
+                ) );
+
+                // Filter and return the HTML button
+                return bp_get_button( apply_filters( 'bp_get_blogs_view_details_blog_button', $button ) );
+        }
+
+/**
  * Output button for visiting a blog in a loop.
  *
  * @see bp_get_blogs_visit_blog_button() for description of arguments.
@@ -1563 +1763 @@
 function bp_blogs_visit_blog_button( $args = '' ) {
         echo bp_get_blogs_visit_blog_button( $args );
 }
+add_action( 'bp_blog_header_actions', 'bp_blogs_visit_blog_button', 10 );
+
         /**
          * Return button for visiting a blog in a loop.
          *
@@ -1609 +1811 @@
                 return bp_get_button( apply_filters( 'bp_get_blogs_visit_blog_button', $button ) );
         }
 
+/**
+ * Add a subcribe button in blog's header
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_join_blog_button( $blog = null ) {
+        echo bp_get_blogs_join_blog_button( $blog );
+}
+add_action( 'bp_blog_header_actions', 'bp_blogs_join_blog_button', 5 );
+
+        /**
+         * Get the blog's subcribe button
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        function bp_get_blogs_join_blog_button( $blog = null ) {
+
+                if ( empty( $blog ) ) {
+                        $blog = bp_blogs_get_current_blog();
+                }
+
+                if ( ! is_user_logged_in() || ! isset( $blog->id ) || ! bp_current_blog_can_subscribe() ) {
+                        return false;
+                }
+
+                // Already a member
+                if ( bp_current_blog_is_member() ) {
+
+                        if ( bp_is_item_admin() ) {
+                                return false;
+                        }
+
+                        $button = array(
+                                'id'                => 'leave_blog',
+                                'component'         => 'blogs',
+                                'must_be_logged_in' => true,
+                                'block_self'        => false,
+                                'wrapper_class'     => 'blog-button leave',
+                                'wrapper_id'        => 'blogbutton-' . $blog->id,
+                                'link_href'         => esc_url( wp_nonce_url( bp_get_blog_view_details_link() . '?action=leave', 'blogs_leave_blog' ) ),
+                                'link_text'         => __( 'Leave', 'buddypress' ),
+                                'link_title'        => __( 'Leave', 'buddypress' ),
+                                'link_class'        => 'blog-button leave-blog confirm',
+                        );
+
+                // Not a member
+                } else {
+
+                        $button = array(
+                                'id'                => 'join_blog',
+                                'component'         => 'blogs',
+                                'must_be_logged_in' => true,
+                                'block_self'        => false,
+                                'wrapper_class'     => 'blog-button join',
+                                'wrapper_id'        => 'blogbutton-' . $blog->id,
+                                'link_href'         => esc_url( wp_nonce_url( bp_get_blog_view_details_link() . '?action=join', 'blogs_join_blog' ) ),
+                                'link_text'         => __( 'Join', 'buddypress' ),
+                                'link_title'        => __( 'Join', 'buddypress' ),
+                                'link_class'        => 'blog-button join-blog',
+                        );
+                }
+
+                // Filter and return the HTML button
+                return bp_get_button( apply_filters( 'bp_get_blogs_join_blog_button', $button ) );
+        }
+
 /** Stats **********************************************************************/
 
 /**
@@ -1669 +1937 @@
          */
         return apply_filters( 'bp_blogs_get_profile_stats', $r['output'], $r );
 }
+
+/**
+ * Output the blogs single item sub nav
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_item_subnav() {
+        $bp = buddypress();
+
+        if ( $bp->blogs->id !== bp_current_component() || ! bp_is_single_item() ) {
+                return;
+        }
+
+        $component = bp_current_component();
+        $the_index = bp_current_action();
+
+        // Default subnav
+        $selected_item = bp_current_action();
+
+        if ( bp_action_variable( 0 ) ) {
+                $selected_item = bp_action_variable( 0 );
+        }
+
+        if ( empty( $bp->{$component}->single_subnav[ $the_index ] ) ) {
+                return;
+        }
+
+        return bp_component_options_nav( $bp->{$component}->single_subnav, $the_index, $selected_item, $component );
+}
+
+/**
+ * Load the appropriate current blog's home page
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_load_blog_front_template( $require_once = false, $blog = null ) {
+        $located = bp_blogs_get_blog_front_template( $blog );
+
+        if ( false !== $located ) {
+                $slug = str_replace( '.php', '', $located );
+
+                /**
+                 * Let plugins adding an action to bp_get_template_part get it from here
+                 *
+                 * @param string $slug Template part slug requested.
+                 * @param string $name Template part name requested.
+                 */
+                do_action( 'get_template_part_' . $slug, $slug, false );
+
+                load_template( $located, $require_once );
+
+        } elseif ( bp_is_active( 'activity' ) && bp_current_blog_is_public() ) {
+                bp_get_template_part( 'blogs/single/activity' );
+
+        } elseif ( bp_is_active( 'members' ) ) {
+                bp_get_template_part( 'blogs/single/members' );
+        }
+
+        return $located;
+}
+
+/**
+ * Locate a custom blog front template if it exsists
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blogs_get_blog_front_template( $blog = null ) {
+        if ( ! is_a( $blog, 'BP_Blogs_Blog' ) ) {
+                $blog = bp_blogs_get_current_blog();
+        }
+
+        if ( ! isset( $blog->id ) ) {
+                return false;
+        }
+
+        if ( isset( $blog->front_template ) ) {
+                return $blog->front_template;
+        }
+
+        $template_names = apply_filters( 'bp_blogs_get_front_template', array(
+                'blogs/single/front-id-'     . sanitize_file_name( $blog->id )     . '.php',
+                'blogs/single/front-slug-'   . sanitize_file_name( $blog->slug )   . '.php',
+                'blogs/single/front.php'
+        ) );
+
+        return bp_locate_template( $template_names, false, true );
+}
+
+/**
+ * Is the current page a specific blog manage screen?
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param string $slug
+ * @return bool
+ */
+function bp_is_blog_manage_screen( $slug = '' ) {
+        return (bool) ( bp_is_blog_manage() && bp_is_action_variable( $slug ) );
+}
+
+/**
+ * Return whether a blog has an avatar
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param  int $blog_id
+ * @return boolean
+ */
+function bp_get_blog_has_avatar( $blog_id = false ) {
+
+        if ( false === $blog_id ) {
+                $blog_id = bp_get_current_blog_id();
+        }
+
+        $blog_avatar = bp_core_fetch_avatar( array(
+                'item_id' => $blog_id,
+                'object'  => 'blog',
+                'no_grav' => true,
+                'html'    => false,
+        ) );
+
+        if ( bp_core_avatar_default( 'local' ) === $blog_avatar ) {
+                return false;
+        }
+
+        return true;
+}
+
+/** Current blog *************************************************************/
+
+/**
+ * Echoes the output of bp_get_current_blog_id()
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_current_blog_id() {
+        echo bp_get_current_blog_id();
+}
+        /**
+         * Returns the ID of the current blog
+         *
+         * @since BuddyPress (2.3.0)
+         * @uses apply_filters() Filter bp_get_current_blog_id to modify this output
+         *
+         * @return string The ID of the current blog, if there is one
+         */
+        function bp_get_current_blog_id() {
+                $current_blog    = bp_blogs_get_current_blog();
+                $current_blog_id = '';
+
+                if ( isset( $current_blog->id ) ) {
+                        $current_blog_id = $current_blog->id;
+                }
+
+                /**
+                 * Filters the ID of the current blog
+                 *
+                 * @since BuddyPress (2.3.0)
+                 *
+                 * @param string $current_blog_id ID of the current blog.
+                 * @param object $current_blog Instance holding the current blog.
+                 */
+                return apply_filters( 'bp_get_current_blog_id', $current_blog_id, $current_blog );
+        }
+
+/**
+ * Echoes the output of bp_get_current_blog_name()
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_current_blog_name() {
+        echo bp_get_current_blog_name();
+}
+        /**
+         * Returns the name of the current blog
+         *
+         * @since BuddyPress (2.3.0)
+         * @uses apply_filters() Filter bp_get_current_blog_name to modify this output
+         *
+         * @return string The name of the current blog, if there is one
+         */
+        function bp_get_current_blog_name() {
+                $current_blog      = bp_blogs_get_current_blog();
+                $current_blog_name = '';
+
+                if ( isset( $current_blog->name ) ) {
+                        $current_blog_name = $current_blog->name;
+                }
+
+                /**
+                 * Filters the name of the current blog
+                 *
+                 * @since BuddyPress (2.3.0)
+                 *
+                 * @param string $current_blog_name Name of the current blog.
+                 * @param object $current_blog Instance holding the current blog.
+                 */
+                return apply_filters( 'bp_get_current_blog_name', $current_blog_name, $current_blog );
+        }
+
+/**
+ * Echoes the output of bp_get_current_blog_slug()
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_current_blog_slug() {
+        echo bp_get_current_blog_slug();
+}
+        /**
+         * Returns the slug of the current blog
+         *
+         * @since BuddyPress (2.3.0)
+         * @uses apply_filters() Filter bp_get_current_blog_slug to modify this output
+         *
+         * @return string The slug of the current blog, if there is one
+         */
+        function bp_get_current_blog_slug() {
+                $current_blog      = bp_blogs_get_current_blog();
+                $current_blog_slug = '';
+
+                if ( isset( $current_blog->slug ) ) {
+                        $current_blog_slug = $current_blog->slug;
+                }
+
+                /**
+                 * Filters the slug of the current blog
+                 *
+                 * @since BuddyPress (2.3.0)
+                 *
+                 * @param string $current_blog_slug Slug of the current blog.
+                 * @param object $current_blog Instance holding the current blog.
+                 */
+                return apply_filters( 'bp_get_current_blog_slug', $current_blog_slug, $current_blog );
+        }
+
+/**
+ * Display the admins in the blog's header
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_current_blog_admins() {
+        echo bp_get_current_blog_admins();
+}
+        /**
+         * Get the admins list
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        function bp_get_current_blog_admins() {
+                $current_blog = bp_blogs_get_current_blog();
+                $pre_output   = false;
+
+                // Do not display admins if the user has no access
+                if ( ! bp_current_blog_has_access() ) {
+                        $pre_output = '';
+                }
+
+                /**
+                 * Use this filter if you need to hide the blog admins by returning false
+                 *
+                 * @since BuddyPress (2.3.0)
+                 *
+                 * @param boolean $pre_output whether to output the list of the current blog admins
+                 */
+                $pre_output = apply_filters( 'bp_pre_get_current_blog_admins', $pre_output, $current_blog );
+                if ( false !== $pre_output ) {
+                        return $pre_output;
+                }
+
+                $output = '<h3>' . esc_html__( 'Site Admins', 'bp-blogs-extended' ) . '</h3>';
+                $output .= '<span class="activity">' . esc_html__( 'No Admins', 'bp-blogs-extended' ) . '</span>';
+
+                if ( ! empty( $current_blog->admins ) ) {
+                        $output = '<ul id="blog-admins">';
+
+                        foreach( (array) $current_blog->admins as $admin ) {
+                                $output .= '<li>';
+
+                                if ( ! buddypress()->avatar->show_avatars ) {
+                                        $output .= sprintf(
+                                                '<a href="%s" title="%s">%s</a>',
+                                                esc_url( bp_core_get_user_domain( $admin->ID, $admin->user_nicename, $admin->user_login ) ),
+                                                sprintf( esc_attr__( 'Profile of %s', 'bp-blogs-extended' ), $admin->display_name ),
+                                                esc_html( $admin->user_nicename )
+                                        );
+                                } else {
+                                        $output .= sprintf(
+                                                '<a href="%s">%s</a>',
+                                                esc_url( bp_core_get_user_domain( $admin->ID, $admin->user_nicename, $admin->user_login ) ),
+                                                bp_core_fetch_avatar( array(
+                                                        'item_id' => esc_attr( $admin->ID ),
+                                                        'email'   => esc_attr( $admin->user_email ),
+                                                        'alt'     => sprintf( esc_attr__( 'Profile picture of %s', 'bp-blogs-extended' ), $admin->display_name )
+                                                ) )
+                                        );
+                                }
+
+                                $output .= '</li>';
+                        }
+
+                        $output .= '</ul>';
+                }
+
+                return apply_filters( 'bp_get_current_blog_admins', $output, $current_blog );
+        }
+
+/**
+ * Display the current blog type
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_current_blog_type() {
+        echo bp_get_current_blog_type();
+}
+
+        /**
+         * Get the current blog type
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        function bp_get_current_blog_type() {
+                $type = esc_html__( 'Private', 'buddypress' );
+
+                if ( bp_current_blog_is_public() ) {
+                        $type = esc_html__( 'Public', 'buddypress' );
+                }
+
+                /**
+                 * Use this filter if you need to edit the blog type
+                 *
+                 * @since BuddyPress (2.3.0)
+                 *
+                 * @param string $type the blog type
+                 */
+                return apply_filters( 'bp_get_current_blog_type', $type );
+        }
+
+/** Blog Members **************************************************************/
+
+/**
+ * The following functions are wrapping some Members loop template functions
+ * It might be interesting in the future to use a specific class to extend
+ * BP_User_Query the same way the groups component is doing to add new filter
+ * options.
+ */
+
+/**
+ * bp_has_members wrapper to fetch the current blog's members
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @see bp_has_members() for detailed available arguments
+ */
+function bp_blog_has_members( $args = '' ) {
+        global $wpdb;
+
+        $meta_key = $wpdb->get_blog_prefix( bp_get_current_blog_id() ) . 'capabilities';
+
+        $r = bp_parse_args( $args, array(
+                'type'            => 'active',
+                'page'            => 1,
+                'per_page'        => 20,
+                'max'             => false,
+                'page_arg'        => 'blogpage',
+                'user_id'         => 0,
+                'meta_key'        => $meta_key,    // Only return users of the current blog
+        ), 'blog_has_members' );
+
+        return bp_has_members( $r );
+}
+
+/**
+ * bp_members wrapper for the current blog's
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blog_members() {
+        return bp_members();
+}
+
+/**
+ * bp_the_member wrapper for the current blog's
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blog_the_member() {
+        return bp_the_member();
+}
+
+/**
+ * bp_member_permalink wrapper for the current blog's
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blog_member_permalink() {
+        return bp_member_permalink();
+}
+
+/**
+ * bp_member_avatar wrapper for the current blog's
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blog_member_avatar() {
+        return bp_member_avatar();
+}
+
+/**
+ * bp_member_name wrapper for the current blog's
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blog_member_name() {
+        return bp_member_name();
+}
+
+/**
+ * bp_get_member_latest_update wrapper for the current blog's
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blog_get_member_latest_update() {
+        return bp_get_member_latest_update();
+}
+
+/**
+ * bp_member_latest_update wrapper for the current blog's
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blog_member_latest_update() {
+        return bp_member_latest_update();
+}
+
+/**
+ * bp_member_last_active wrapper for the current blog's
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_blog_member_last_active() {
+        return bp_member_last_active();
+}
+
+/**
+ * Output button to remove a member from the site.
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @see bp_get_blog_member_remove_button() for description of arguments.
+ *
+ * @param array $args See {@link bp_get_blog_member_remove_button()}.
+ */
+function bp_blog_member_remove_button( $args = '' ) {
+        echo bp_get_blog_member_remove_button( $args );
+}
+
+        /**
+         * Return button to remove a member from the site.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @see BP_Button for a complete description of arguments and return
+         *      value.
+         *
+         * @param array $args {
+         *     Arguments are listed below, with their default values. For a
+         *     complete description of arguments, see {@link BP_Button}.
+         *     @type string $id Default: 'blog_remove_member'.
+         *     @type string $component Default: 'blogs'.
+         *     @type bool $must_be_logged_in Default: false.
+         *     @type bool $block_self Default: false.
+         *     @type string $wrapper_class Default: 'blog-button remove'.
+         *     @type string $link_href View details link of the current blog in the loop.
+         *     @type string $link_class Default: 'blog-button remove'.
+         *     @type string $link_text Default: 'Remove member'.
+         *     @type string $link_title Default: 'Remove member'.
+         * }
+         * @return string The HTML for the Visit button.
+         */
+        function bp_get_blog_member_remove_button( $args = '' ) {
+                // Do not display the button if the single blog feature is disabled
+                if ( bp_blogs_disable_single_items() ) {
+                        return;
+                }
+
+                $remove_link = trailingslashit( bp_get_blog_view_details_link() . 'manage/members' );
+
+                $button = wp_parse_args( $args, array(
+                        'id'                => 'blog_remove_member',
+                        'component'         => 'blogs',
+                        'must_be_logged_in' => true,
+                        'block_self'        => true,
+                        'wrapper_class'     => 'blog-button remove',
+                        'link_href'         => esc_url( wp_nonce_url( $remove_link . '?remove_member=' . bp_get_member_user_id(), 'blogs_remove_member' ) ),
+                        'link_class'        => 'blog-button remove',
+                        'link_text'         => __( 'Remove member', 'buddypress' ),
+                        'link_title'        => __( 'Remove member', 'buddypress' ),
+                ) );
+
+                // Filter and return the HTML button
+                return bp_get_button( apply_filters( 'bp_get_blog_member_remove_button', $button ) );
+        }

src/bp-blogs/classes/class-bp-blogs-blog.php

@@ -27 +27 @@
          *
          * @param int $id Optional. The ID of the blog.
          */
-        public function __construct( $id = null ) {
-                if ( !empty( $id ) ) {
+        public function __construct( $id = null, $args = array() ) {
+                $this->args = wp_parse_args( $args, array(
+                        'populate_extras' => false,
+                ) );
+
+                if ( ! empty( $id ) ) {
                         $this->id = $id;
                         $this->populate();
                 }
@@ -42 +46 @@
 
                 $bp = buddypress();
 
-                $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name} WHERE id = %d", $this->id ) );
+                // Are we getting extra blog data?
+                if ( ! empty( $this->args['populate_extras'] ) ) {
+
+                        // We need some of the blog details and it's a good
+                        // way to check the blog is not moderated
+                        $blog_details = get_blog_details( $this->id );
+
+                        if ( empty( $blog_details ) || 1 === (int) $blog_details->mature || 1 === (int) $blog_details->spam || 1 === (int) $blog_details->archived || 1 === (int) $blog_details->deleted ) {
+                                $this->id = 0;
+                                return;
+                        }
+
+                        // Set the blog id
+                        $this->blog_id = $this->id;
+
+                        // Populating BuddyPress blog metas for the requested blog
+                        foreach ( bp_blogs_get_blogmeta( $this->id ) as $key => $meta ) {
+                                // Don't fetch private blogmeta
+                                if ( is_protected_meta( $key ) ) {
+                                        continue;
+                                }
+
+                                if ( count( $meta ) == 1 ) {
+                                        $this->{$key} = maybe_unserialize( $meta[0] );
+                                } else {
+                                        $this->{$key} = array_map( 'maybe_unserialize', $meta );
+                                }
+                        }
+
+                        if ( ! isset( $this->url ) ) {
+                                $this->url = $blog_details->siteurl;
+                        }
+
+                        if ( ! isset( $this->name ) ) {
+                                $this->name = $blog_details->blogname;
+                        }
+
+                        // The following properties are necessary for the blogs loop
+                        $this->path   = $blog_details->path;
+                        $this->domain = $blog_details->domain;
+                        $current_site = get_current_site();
 
-                $this->user_id = $blog->user_id;
-                $this->blog_id = $blog->blog_id;
+                        if ( (int) $current_site->id === (int) $this->blog_id ) {
+                                $this->slug = apply_filters( 'bp_blogs_get_site_slug', 'root' );
+                        } else {
+                                $this->slug = trim( str_replace( $current_site->path, '', $this->path ), '/' );
+                        }
+
+                        if ( bp_get_root_blog_id() !== $this->id ) {
+                                $needs_reset = true;
+                                switch_to_blog( $this->id );
+                        }
+
+                        // Who are the admins ?
+                        $this->admins = get_users( array(
+                                'role'   => 'administrator',
+                                'fields' => array( 'ID', 'display_name', 'user_login', 'user_nicename', 'user_email' ),
+                        ) );
+
+                        $this->admin_user_id    = $this->admins[0]->ID;
+                        $this->admin_user_email = $this->admins[0]->user_email;
+
+                        // How many users ?
+                        $blog_users               = count_users();
+                        $this->total_member_count = $blog_users['total_users'];
+
+                        // How many posts ?
+                        $this->post_count = $blog_details->post_count;
+
+                        // Is current user a member of the blog ?
+                        $this->is_member = current_user_can( 'read' );
+
+                        // Blog visibility
+                        $this->blog_public = $blog_details->public;
+
+                        if ( isset( $needs_reset ) ) {
+                                restore_current_blog();
+                        }
+
+                } else {
+                        $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name} WHERE id = %d", $this->id ) );
+
+                        $this->user_id = $blog->user_id;
+                        $this->blog_id = $blog->blog_id;
+                }
         }
 
         /**
@@ -241 +326 @@
                 global $wpdb;
 
                 bp_blogs_delete_blogmeta( $blog_id );
-                
+
                 $bp = buddypress();
 
                 return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name} WHERE blog_id = %d", $blog_id ) );

src/bp-core/admin/bp-core-admin-settings.php

@@ -218 +218 @@
 <?php
 }
 
+/** Blogs Section ************************************************************/
+
+/**
+ * Blogs settings section description for the settings page
+ *
+ * @since BuddyPress (2.3.0)
+ */
+function bp_admin_setting_callback_blogs_section() { }
+
+/**
+ * Disable the Blogs single items
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @uses checked() To display the checked attribute
+ */
+function bp_admin_setting_callback_blog_single_item() {
+?>
+
+        <input id="bp-blogs-disable-single-items" name="bp-blogs-disable-single-items" type="checkbox"value="1" <?php checked( bp_blogs_disable_single_items() ); ?> />
+        <label for="bp-blogs-disable-single-items"><?php _e( 'Disable single sites details', 'buddypress' ); ?></label>
+        <p class="description"><?php _e( 'Use this setting if you prefer to only use the sites directory.', 'buddypress' ); ?></p>
+
+<?php
+}
+
 /** Settings Page *************************************************************/
 
 /**

src/bp-core/bp-core-admin.php

@@ -401 +401 @@
                     add_settings_field( 'bp-disable-avatar-uploads', __( 'Profile Photo Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', $avatar_setting );
                     register_setting  ( 'buddypress',         'bp-disable-avatar-uploads',   'intval'                                                                                    );
                 }
+
+                /** Blogs Section ****************************************************/
+
+                if ( bp_is_active( 'blogs' ) && is_multisite() ) {
+
+                        // Add the main section
+                        add_settings_section( 'bp_blogs', __( 'Network Sites Settings',  'buddypress' ), 'bp_admin_setting_callback_blogs_section', 'buddypress' );
+
+                        // Allow subscriptions setting
+                        add_settings_field( 'bp-blogs-disable-single-items', __( 'Single site details', 'buddypress' ), 'bp_admin_setting_callback_blog_single_item', 'buddypress', 'bp_blogs' );
+                        register_setting  ( 'buddypress', 'bp-blogs-disable-single-items', 'intval' );
+                }
         }
 
         /**

src/bp-core/bp-core-attachments.php

@@ -312 +312 @@
                         // User profile photo
                         } elseif ( bp_is_active( 'xprofile' ) && 'user' === $args['object'] ) {
                                 $can = bp_loggedin_user_id() === (int) $args['item_id'] || bp_current_user_can( 'bp_moderate' );
+                        // Site logo
+                        } elseif ( bp_is_active( 'blogs' ) && 'blog' === $args['object'] ) {
+                                $can = current_user_can_for_blog( (int) $args['item_id'], 'manage_options' );
                         }
                 /**
                  * No avatar arguments, fallback to bp_user_can_create_groups()

src/bp-core/bp-core-avatars.php

@@ -213 +213 @@
                 switch ( $params['object'] ) {
 
                         case 'blog'  :
-                                $params['item_id'] = $current_blog->id;
+                                if ( bp_is_active( 'blogs' ) ) {
+                                        $params['item_id'] = bp_get_current_blog_id();
+                                } else {
+                                        $params['item_id'] = false;
+                                }
                                 break;
 
                         case 'group' :
@@ -664 +668 @@
         extract( $args, EXTR_SKIP );
 
         if ( empty( $item_id ) ) {
-                if ( 'user' == $object )
+                if ( 'user' == $object ) {
                         $item_id = bp_displayed_user_id();
-                elseif ( 'group' == $object )
+                } elseif ( 'group' == $object && bp_is_active( 'groups' ) ) {
                         $item_id = buddypress()->groups->current_group->id;
-                elseif ( 'blog' == $object )
-                        $item_id = $current_blog->id;
+                } elseif ( 'blog' == $object && bp_is_active( 'blogs' ) ) {
+                        $item_id = bp_get_current_blog_id();
+                }
 
                 /** This filter is documented in bp-core/bp-core-avatars.php */
                 $item_id = apply_filters( 'bp_core_avatar_item_id', $item_id, $object );
 
-                if ( !$item_id ) return false;
+                if ( ! $item_id ) {
+                        return false;
+                }
         }
 
         if ( empty( $avatar_dir ) ) {
@@ -920 +927 @@
                                 'populate_extras' => false,
                         ) );
                 }
+        } elseif ( 'blog' === $bp_params['object'] && bp_is_active( 'blogs' ) ) {
+                $bp_params['upload_dir_filter'] = 'blogs_avatar_upload_dir';
+
+                if ( ! bp_get_current_blog_id() && ! empty( $bp_params['item_id'] ) ) {
+                        $needs_reset = array( 'component' => 'blogs', 'key' => 'current_blog', 'value' => $bp->blogs->current_blog );
+                        $bp->blogs->current_blog = bp_blogs_get_blog( array(
+                                'blog_id'        => $bp_params['item_id'],
+                                'populate_extras' => true,
+                        ) );
+                }
         } else {
                 /**
                  * Filter here to deal with other components
@@ -1808 +1825 @@
                 }
         }
 
+        if ( bp_is_active( 'blogs' ) && bp_is_blog_manage_screen( 'edit-logo' ) ) {
+                $retval = ! bp_core_get_root_option( 'bp-disable-avatar-uploads' );
+        }
+
         /**
          * Use this filter if you need to :
          * - Load the avatar UI for a component that is !groups or !user (return true regarding your conditions)

src/bp-core/bp-core-buddybar.php

@@ -46 +46 @@
                 'site_admin_only'         => false, // Can only site admins see this nav item?
                 'position'                => 99,    // Index of where this nav item should be positioned
                 'screen_function'         => false, // The name of the function to run when clicked
-                'default_subnav_slug'     => false  // The slug of the default subnav item to select when clicked
+                'default_subnav_slug'     => false, // The slug of the default subnav item to select when clicked
+                'single_nav'              => false, // The component id to create the single nav for
         );
 
         $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
 
         // If we don't have the required info we need, don't create this subnav item
-        if ( empty( $name ) || empty( $slug ) )
+        if ( empty( $r['name'] ) || empty( $r['slug'] ) ) {
                 return false;
+        }
 
         // If this is for site admins only and the user is not one, don't create the subnav item
-        if ( !empty( $site_admin_only ) && !bp_current_user_can( 'bp_moderate' ) )
+        if ( ! empty( $r['site_admin_only'] ) && ! bp_current_user_can( 'bp_moderate' ) ) {
                 return false;
+        }
 
-        if ( empty( $item_css_id ) )
-                $item_css_id = $slug;
+        // Defaults to slug
+        $item_css_id = $r['slug'];
+
+        if ( ! empty( $r['item_css_id'] ) ) {
+                $item_css_id = $r['item_css_id'];
+        }
 
-        $bp->bp_nav[$slug] = array(
-                'name'                    => $name,
-                'slug'                    => $slug,
-                'link'                    => trailingslashit( bp_loggedin_user_domain() . $slug ),
+        $nav_item = array(
+                'name'                    => $r['name'],
+                'slug'                    => $r['slug'],
+                'link'                    => '',
                 'css_id'                  => $item_css_id,
-                'show_for_displayed_user' => $show_for_displayed_user,
-                'position'                => $position,
-                'screen_function'         => &$screen_function,
-                'default_subnav_slug'     => $default_subnav_slug
+                'show_for_displayed_user' => $r['show_for_displayed_user'],
+                'position'                => $r['position'],
+                'screen_function'         => &$r['screen_function'],
+                'default_subnav_slug'     => $r['default_subnav_slug']
         );
 
+        $is_component_single_nav = ! empty( $r['single_nav'] ) && bp_is_active( $r['single_nav'] ) && isset( $bp->{$r['single_nav']}->single_nav ) && bp_is_current_component( $r['single_nav'] );
+
+        // The component is managing its single items nav
+        if ( $is_component_single_nav ) {
+                $component = $r['single_nav'];
+
+                /**
+                 * Filter here to add your custom function to build the component root slug
+                 *
+                 * @since BuddyPress (2.3.0)
+                 *
+                 * $callable string the function to use
+                 * $component  string the component id
+                 */
+                $callable = apply_filters( 'bp_core_new_nav_item_component_callable', 'bp_get_' . $component . '_root_slug', $component );
+
+                if ( ! is_callable( $callable ) ) {
+                        return false;
+                }
+
+                $nav_item['link'] = trailingslashit( bp_get_root_domain() . '/' . call_user_func( $callable ) . '/' . bp_current_item() . '/' . $r['slug'] );
+                $bp->{$r['single_nav']}->single_nav[ $r['slug'] ] = $nav_item;
+
+        // Default nav is core nav
+        } else {
+                $nav_item['link'] = trailingslashit( bp_loggedin_user_domain() . $r['slug'] );
+                $bp->bp_nav[ $r['slug'] ] = $nav_item;
+        }
+
         /**
          * If this nav item is hidden for the displayed user, and
          * the logged in user is not the displayed user
          * looking at their own profile, don't create the nav item.
          */
-        if ( empty( $show_for_displayed_user ) && !bp_user_has_access() )
+        if ( empty( $r['show_for_displayed_user'] ) && ! bp_user_has_access() ) {
                 return false;
+        }
 
         /**
          * If the nav item is visible, we are not viewing a user, and this is a root
          * component, don't attach the default subnav function so we can display a
          * directory or something else.
          */
-        if ( ( -1 != $position ) && bp_is_root_component( $slug ) && !bp_displayed_user_id() )
+        if ( ( -1 != $r['position'] ) && bp_is_root_component( $r['slug'] ) && ! bp_displayed_user_id() && ! $is_component_single_nav ) {
                 return;
+        }
+
+        // Manage the component's specific single nav
+        if ( $is_component_single_nav && bp_is_current_action( $r['slug'] ) ) {
+                if ( ! empty( $r['default_subnav_slug'] ) && bp_is_action_variable( $r['default_subnav_slug'], 0 ) && ! bp_action_variable( 1 ) ) {
+                        unset( $bp->canonical_stack['action_variables'][0] );
+                } elseif ( ! bp_action_variable( 0 ) ) {
 
-        // Look for current component
-        if ( bp_is_current_component( $slug ) || bp_is_current_item( $slug ) ) {
+                        // Add our screen hook if screen function is callable
+                        if ( is_callable( $r['screen_function'] ) ) {
+                                add_action( 'bp_screens', $r['screen_function'], 3 );
+                        }
+
+                        if ( ! empty( $r['default_subnav_slug'] ) ) {
+                                /**
+                                 * Filters the component's single nav default subnav item.
+                                 *
+                                 * @since BuddyPress (2.3.0)
+                                 *
+                                 * @param string $default_subnav_slug The slug of the default subnav item
+                                 *                                    to select when clicked.
+                                 * @param array  $r                   Parsed arguments for the nav item.
+                                 */
+                                $bp->current_action = apply_filters( 'bp_default_component_single_subnav', $r['default_subnav_slug'], $r );
+                        }
+                }
+
+        // Look for current component in core nav
+        } elseif ( bp_is_current_component( $r['slug'] ) || bp_is_current_item( $r['slug'] ) ) {
 
                 // The requested URL has explicitly included the default subnav
                 // (eg: http://example.com/members/membername/activity/just-me/)
                 // The canonical version will not contain this subnav slug.
-                if ( !empty( $default_subnav_slug ) && bp_is_current_action( $default_subnav_slug ) && !bp_action_variable( 0 ) ) {
+                if ( ! empty( $r['default_subnav_slug'] ) && bp_is_current_action( $r['default_subnav_slug'] ) && ! bp_action_variable( 0 ) ) {
                         unset( $bp->canonical_stack['action'] );
                 } elseif ( ! bp_current_action() ) {
 
                         // Add our screen hook if screen function is callable
-                        if ( is_callable( $screen_function ) ) {
-                                add_action( 'bp_screens', $screen_function, 3 );
+                        if ( is_callable( $r['screen_function'] ) ) {
+                                add_action( 'bp_screens', $r['screen_function'], 3 );
                         }
 
-                        if ( !empty( $default_subnav_slug ) ) {
+                        if ( ! empty( $r['default_subnav_slug'] ) ) {
 
                                 /**
                                  * Filters the default component subnav item.
@@ -116 +178 @@
                                  *                                    to select when clicked.
                                  * @param array  $r                   Parsed arguments for the nav item.
                                  */
-                                $bp->current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
+                                $bp->current_action = apply_filters( 'bp_default_component_subnav', $r['default_subnav_slug'], $r );
                         }
                 }
         }
@@ -212 +274 @@
  *
  * @return bool|null Returns false on failure.
  */
-function bp_core_sort_nav_items() {
+function bp_core_sort_nav_items( $component = '' ) {
         $bp = buddypress();
 
-        if ( empty( $bp->bp_nav ) || !is_array( $bp->bp_nav ) )
+        if ( empty( $component ) || ! bp_is_active( $component ) ) {
+                $nav = $bp->bp_nav;
+        } else {
+                $nav = $bp->{$component}->single_nav;
+        }
+
+        if ( empty( $nav ) || ! is_array( $nav ) ) {
                 return false;
+        }
 
         $temp = array();
 
-        foreach ( (array) $bp->bp_nav as $slug => $nav_item ) {
+        foreach ( (array) $nav as $slug => $nav_item ) {
                 if ( empty( $temp[$nav_item['position']]) ) {
                         $temp[$nav_item['position']] = $nav_item;
                 } else {
@@ -234 +303 @@
         }
 
         ksort( $temp );
-        $bp->bp_nav = &$temp;
+        $nav = &$temp;
+
+        if ( empty( $component ) || ! bp_is_active( $component ) ) {
+                $bp->bp_nav = $nav;
+        } else {
+                $bp->{$component}->single_nav = $nav;
+        }
 }
 add_action( 'wp_head',    'bp_core_sort_nav_items' );
 add_action( 'admin_head', 'bp_core_sort_nav_items' );
@@ -286 +361 @@
                 'screen_function'   => false, // The name of the function to run when clicked
                 'link'              => '',    // The link for the subnav item; optional, not usually required.
                 'show_in_admin_bar' => false, // Show the Manage link in the current group's "Edit" Admin Bar menu
+                'single_subnav'     => false, // The component id to create the single subnav for
         ) );
 
-        extract( $r, EXTR_SKIP );
-
         // If we don't have the required info we need, don't create this subnav item
-        if ( empty( $name ) || empty( $slug ) || empty( $parent_slug ) || empty( $parent_url ) || empty( $screen_function ) )
+        if ( empty( $r['name'] ) || empty( $r['slug'] ) || empty( $r['parent_slug'] ) || empty( $r['parent_url'] ) || empty( $r['screen_function'] ) ) {
                 return false;
+        }
+
+        $parent_default_subnav  = '';
+        $parent_screen_function = '';
+        $is_component_subnav    = ! empty( $r['single_subnav'] ) && bp_is_active( $r['single_subnav'] ) && isset( $bp->{$r['single_subnav']}->single_subnav );
+
+        // The component is managing its single items subnav
+        if ( $is_component_subnav && isset( $bp->{$r['single_subnav']}->single_nav ) ) {
+                if ( ! empty( $bp->{$r['single_subnav']}->single_nav[ $r['parent_slug'] ]['default_subnav_slug'] ) ) {
+                        $parent_default_subnav  = $bp->{$r['single_subnav']}->single_nav[ $r['parent_slug'] ]['default_subnav_slug'];
+                }
+
+                if ( ! empty( $bp->{$r['single_subnav']}->single_nav[ $r['parent_slug'] ]['screen_function'] ) ) {
+                        $parent_screen_function = $bp->{$r['single_subnav']}->single_nav[ $r['parent_slug'] ]['screen_function'];
+                }
+
+        // Default nav is core nav
+        } else {
+                if ( ! empty( $bp->bp_nav[ $r['parent_slug'] ]['default_subnav_slug'] ) ) {
+                        $parent_default_subnav  = $bp->bp_nav[ $r['parent_slug'] ]['default_subnav_slug'];
+                }
+
+                if ( ! empty( $bp->bp_nav[ $r['parent_slug'] ]['screen_function'] ) ) {
+                        $parent_screen_function = $bp->bp_nav[ $r['parent_slug'] ]['screen_function'];
+                }
+        }
 
         // Link was not forced, so create one
-        if ( empty( $link ) ) {
-                $link = trailingslashit( $parent_url . $slug );
+        if ( empty( $r['link'] ) ) {
+                $link = trailingslashit( $r['parent_url'] . $r['slug'] );
 
                 // If this sub item is the default for its parent, skip the slug
-                if ( ! empty( $bp->bp_nav[$parent_slug]['default_subnav_slug'] ) && $slug == $bp->bp_nav[$parent_slug]['default_subnav_slug'] ) {
-                        $link = trailingslashit( $parent_url );
+                if ( $r['slug'] == $parent_default_subnav ) {
+                        $link = trailingslashit( $r['parent_url'] );
                 }
+        } else {
+                $link = $r['link'];
         }
 
         // If this is for site admins only and the user is not one, don't create the subnav item
-        if ( !empty( $site_admin_only ) && !bp_current_user_can( 'bp_moderate' ) )
+        if ( ! empty( $r['site_admin_only'] ) && ! bp_current_user_can( 'bp_moderate' ) ) {
                 return false;
+        }
+
+        // Defaults to slug
+        $item_css_id = $r['slug'];
 
-        if ( empty( $item_css_id ) )
-                $item_css_id = $slug;
+        if ( ! empty( $r['item_css_id'] ) ) {
+                $item_css_id = $r['item_css_id'];
+        }
 
         $subnav_item = array(
-                'name'              => $name,
+                'name'              => $r['name'],
                 'link'              => $link,
-                'slug'              => $slug,
+                'slug'              => $r['slug'],
                 'css_id'            => $item_css_id,
-                'position'          => $position,
-                'user_has_access'   => $user_has_access,
-                'no_access_url'     => $no_access_url,
-                'screen_function'   => &$screen_function,
+                'position'          => $r['position'],
+                'user_has_access'   => $r['user_has_access'],
+                'no_access_url'     => $r['no_access_url'],
+                'screen_function'   => &$r['screen_function'],
                 'show_in_admin_bar' => (bool) $r['show_in_admin_bar'],
         );
 
-        $bp->bp_options_nav[$parent_slug][$slug] = $subnav_item;
+        // The component is managing its single items nav
+        if ( $is_component_subnav ) {
+                $bp->{$r['single_subnav']}->single_subnav[ $r['parent_slug'] ][ $r['slug'] ] = $subnav_item;
 
-        /**
-         * The last step is to hook the screen function for the added subnav item. But this only
-         * needs to be done if this subnav item is the current view, and the user has access to the
-         * subnav item. We figure out whether we're currently viewing this subnav by checking the
-         * following two conditions:
-         *   (1) Either:
-         *           (a) the parent slug matches the current_component, or
-         *           (b) the parent slug matches the current_item
-         *   (2) And either:
-         *           (a) the current_action matches $slug, or
-         *       (b) there is no current_action (ie, this is the default subnav for the parent nav)
-         *           and this subnav item is the default for the parent item (which we check by
-         *           comparing this subnav item's screen function with the screen function of the
-         *           parent nav item in $bp->bp_nav). This condition only arises when viewing a
-         *           user, since groups should always have an action set.
-         */
+                if ( ! bp_is_current_component( $r['single_subnav'] ) && ! bp_is_current_action( $r['parent_slug'] ) ) {
+                        return;
+                }
 
-        // If we *don't* meet condition (1), return
-        if ( ! bp_is_current_component( $parent_slug ) && ! bp_is_current_item( $parent_slug ) )
-                return;
+                if ( bp_action_variable( 0 ) && bp_is_action_variable( $r['slug'], 0 ) ) {
+
+                        $hooked = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
+
+                        // If redirect args have been returned, perform the redirect now
+                        if ( ! empty( $hooked['status'] ) && 'failure' === $hooked['status'] && isset( $hooked['redirect_args'] ) ) {
+                                bp_core_no_access( $hooked['redirect_args'] );
+                        }
+                }
+
+        // Default nav is core nav
+        } else {
+                $bp->bp_options_nav[ $r['parent_slug'] ][ $r['slug'] ] = $subnav_item;
+
+                /**
+                 * The last step is to hook the screen function for the added subnav item. But this only
+                 * needs to be done if this subnav item is the current view, and the user has access to the
+                 * subnav item. We figure out whether we're currently viewing this subnav by checking the
+                 * following two conditions:
+                 *   (1) Either:
+                 *           (a) the parent slug matches the current_component, or
+                 *           (b) the parent slug matches the current_item
+                 *   (2) And either:
+                 *           (a) the current_action matches $slug, or
+                 *       (b) there is no current_action (ie, this is the default subnav for the parent nav)
+                 *           and this subnav item is the default for the parent item (which we check by
+                 *           comparing this subnav item's screen function with the screen function of the
+                 *           parent nav item in $bp->bp_nav). This condition only arises when viewing a
+                 *           user, since groups should always have an action set.
+                 */
+
+                // If we *don't* meet condition (1), return
+                if ( ! bp_is_current_component( $r['parent_slug'] ) && ! bp_is_current_item( $r['parent_slug'] ) ) {
+                        return;
+                }
 
-        // If we *do* meet condition (2), then the added subnav item is currently being requested
-        if ( ( bp_current_action() && bp_is_current_action( $slug ) ) || ( bp_is_user() && ! bp_current_action() && ( $screen_function == $bp->bp_nav[$parent_slug]['screen_function'] ) ) ) {
+                // If we *do* meet condition (2), then the added subnav item is currently being requested
+                if ( ( bp_current_action() && bp_is_current_action( $r['slug'] ) ) || ( bp_is_user() && ! bp_current_action() && ( $r['screen_function'] == $parent_screen_function ) ) ) {
 
-                $hooked = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
+                        $hooked = bp_core_maybe_hook_new_subnav_screen_function( $subnav_item );
 
-                // If redirect args have been returned, perform the redirect now
-                if ( ! empty( $hooked['status'] ) && 'failure' === $hooked['status'] && isset( $hooked['redirect_args'] ) ) {
-                        bp_core_no_access( $hooked['redirect_args'] );
+                        // If redirect args have been returned, perform the redirect now
+                        if ( ! empty( $hooked['status'] ) && 'failure' === $hooked['status'] && isset( $hooked['redirect_args'] ) ) {
+                                bp_core_no_access( $hooked['redirect_args'] );
+                        }
                 }
         }
 }
@@ -454 +583 @@
  *
  * @return bool|null Returns false on failure.
  */
-function bp_core_sort_subnav_items() {
+function bp_core_sort_subnav_items( $component = '' ) {
         $bp = buddypress();
 
-        if ( empty( $bp->bp_options_nav ) || !is_array( $bp->bp_options_nav ) )
+        if ( empty( $component ) || ! bp_is_active( $component ) ) {
+                $subnav = $bp->bp_options_nav;
+        } else {
+                $subnav = $bp->{$component}->single_subnav;
+        }
+
+        if ( empty( $subnav ) || ! is_array( $subnav ) ) {
                 return false;
+        }
 
-        foreach ( (array) $bp->bp_options_nav as $parent_slug => $subnav_items ) {
+        foreach ( (array) $subnav as $parent_slug => $subnav_items ) {
                 if ( !is_array( $subnav_items ) )
                         continue;
 
@@ -477 +613 @@
                         }
                 }
                 ksort( $temp );
-                $bp->bp_options_nav[$parent_slug] = &$temp;
+                $subnav[$parent_slug] = &$temp;
                 unset( $temp );
         }
+
+        if ( empty( $component ) || ! bp_is_active( $component ) ) {
+                $bp->bp_options_nav = $subnav;
+        } else {
+                $bp->{$component}->single_subnav = $subnav;
+        }
 }
 add_action( 'wp_head',    'bp_core_sort_subnav_items' );
 add_action( 'admin_head', 'bp_core_sort_subnav_items' );

src/bp-core/bp-core-filters.php

@@ -731 +731 @@
 
         // A single item from a component other than groups
         } elseif ( bp_is_single_item() ) {
-                $title_parts = array( $bp->bp_options_title, $bp->bp_options_nav[ bp_current_item() ][ bp_current_action() ]['name'] );
+                if ( isset( $bp->{$bp->current_component}->single_nav ) ) {
+                        $component_nav_section = '';
+
+                        // Get the component nav section name
+                        foreach ( $bp->{$bp->current_component}->single_nav as $component_nav_item ) {
+                                if ( bp_current_action() !== $component_nav_item['slug'] ) {
+                                        continue;
+                                }
+
+                                $component_nav_section = $component_nav_item['name'];
+                        }
+
+                        $title_parts = array( $bp->bp_options_title, $component_nav_section );
+                } else {
+                        $title_parts = array( $bp->bp_options_title, $bp->bp_options_nav[ bp_current_item() ][ bp_current_action() ]['name'] );
+                }
 
         // An index or directory
         } elseif ( bp_is_directory() ) {

src/bp-core/bp-core-options.php

@@ -44 +44 @@
                 // Used to decide if blogs need indexing
                 'bp-blogs-first-install'          => false,
 
+                // Disable the blogs single items
+                'bp-blogs-disable-single-items'   => false,
+
                 /** Settings **********************************************************/
 
                 // Disable the WP to BP profile sync
@@ -630 +633 @@
 }
 
 /**
+ * Are blogs single items disabled?
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param bool $default Optional. Fallback value if not found in the database.
+ *        Default: false.
+ * @return bool True if blogs single items are disabled, otherwise false.
+ */
+function bp_blogs_disable_single_items( $default = false ) {
+
+        /**
+         * Filters whether or not blogs single items are disabled.
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @param bool $value Whether or not blogs single items are disabled.
+         */
+        return (bool) apply_filters( 'bp_blogs_disable_single_items', (bool) bp_get_option( 'bp-blogs-disable-single-items', $default ) );
+}
+
+/**
  * Is group creation turned off?
  *
  * @since BuddyPress (1.6.0)

src/bp-core/bp-core-template.php

@@ -10 +10 @@
 defined( 'ABSPATH' ) || exit;
 
 /**
+ * Output a component's single item main nav
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param  string $component the component id
+ */
+function bp_component_main_nav( $component = '' ) {
+        $bp = buddypress();
+
+        if ( empty( $component ) ) {
+                $component = bp_is_user() ? $bp->members->id : bp_current_component();
+        }
+
+        if ( ! isset( $bp->{$component}->single_nav ) || ! is_array( $bp->{$component}->single_nav ) ) {
+                return;
+        }
+
+        foreach ( (array) $bp->{$component}->single_nav as $main_nav_item ) {
+
+                $selected = '';
+
+                if ( bp_is_current_action( $main_nav_item['slug'] ) ) {
+                        $selected = ' class="current selected"';
+                }
+
+                echo apply_filters_ref_array( 'bp_component_main_nav_' . $main_nav_item['css_id'], array( '<li id="' . esc_attr( $main_nav_item['slug'] ) . '-' . esc_attr( $main_nav_item['css_id'] ) . '-li" ' . $selected . '><a id="' . esc_attr( $component ) . '-' . esc_attr( $main_nav_item['slug'] ) . '" href="' . esc_url( $main_nav_item['link'] ) . '">' . $main_nav_item['name'] . '</a></li>', &$main_nav_item['slug'] ) );
+        }
+}
+
+/**
+ * Output a component's single item options nav
+ *
+ * @since BuddyPress (2.3.0)
+ *
+ * @param array  $subnav the subnav containing the nav items to output
+ * @param string $the_index the subnav index containing the nav items
+ * @param string $selected_item the current item displayed
+ * @param string $list_type extra css attribute
+ */
+function bp_component_options_nav( $subnav, $the_index = '', $selected_item = '', $list_type = '' ) {
+        $bp = buddypress();
+
+        if ( empty( $subnav ) || ! is_array( $subnav ) ) {
+                return false;
+        }
+
+        // Defaults to bp_option_nav
+        $filter_prefix = 'bp_get_options_nav';
+
+        if ( ! empty( $list_type ) && 'group' !== $list_type && 'personal' !== $list_type && bp_current_component() ) {
+                $filter_prefix = 'bp_' . bp_current_component() . '_single_subnav';
+        }
+
+        // Loop through each navigation item
+        foreach ( (array) $subnav[$the_index] as $subnav_item ) {
+                if ( empty( $subnav_item['user_has_access'] ) ) {
+                        continue;
+                }
+
+                // If the current action or an action variable matches the nav item id, then add a highlight CSS class.
+                if ( $subnav_item['slug'] == $selected_item ) {
+                        $selected = ' class="current selected"';
+                } else {
+                        $selected = '';
+                }
+
+                /**
+                 * Filters the "options nav", the secondary-level single item navigation menu.
+                 *
+                 * This is a dynamic filter that is dependent on the provided css_id value.
+                 *
+                 * @since BuddyPress (1.1.0)
+                 *
+                 * @param string $value         HTML list item for the submenu item.
+                 * @param array  $subnav_item   Submenu array item being displayed.
+                 * @param string $selected_item Current action.
+                 */
+                echo apply_filters( $filter_prefix . '_' . $subnav_item['css_id'], '<li id="' . esc_attr( $subnav_item['css_id'] . '-' . $list_type . '-li' ) . '" ' . $selected . '><a id="' . esc_attr( $subnav_item['css_id'] ) . '" href="' . esc_url( $subnav_item['link'] ) . '">' . $subnav_item['name'] . '</a></li>', $subnav_item, $selected_item );
+        }
+}
+
+/**
  * Output the "options nav", the secondary-level single item navigation menu.
  *
  * Uses the $bp->bp_options_nav global to render out the sub navigation for the
@@ -55 +137 @@
                 }
         }
 
-        // Loop through each navigation item
-        foreach ( (array) $bp->bp_options_nav[$the_index] as $subnav_item ) {
-                if ( empty( $subnav_item['user_has_access'] ) ) {
-                        continue;
-                }
+        // List type depends on our current component
+        $list_type = bp_is_group() ? 'groups' : 'personal';
 
-                // If the current action or an action variable matches the nav item id, then add a highlight CSS class.
-                if ( $subnav_item['slug'] == $selected_item ) {
-                        $selected = ' class="current selected"';
-                } else {
-                        $selected = '';
-                }
-
-                // List type depends on our current component
-                $list_type = bp_is_group() ? 'groups' : 'personal';
-
-                /**
-                 * Filters the "options nav", the secondary-level single item navigation menu.
-                 *
-                 * This is a dynamic filter that is dependent on the provided css_id value.
-                 *
-                 * @since BuddyPress (1.1.0)
-                 *
-                 * @param string $value         HTML list item for the submenu item.
-                 * @param array  $subnav_item   Submenu array item being displayed.
-                 * @param string $selected_item Current action.
-                 */
-                echo apply_filters( 'bp_get_options_nav_' . $subnav_item['css_id'], '<li id="' . esc_attr( $subnav_item['css_id'] . '-' . $list_type . '-li' ) . '" ' . $selected . '><a id="' . esc_attr( $subnav_item['css_id'] ) . '" href="' . esc_url( $subnav_item['link'] ) . '">' . $subnav_item['name'] . '</a></li>', $subnav_item, $selected_item );
-        }
+        return bp_component_options_nav( $bp->bp_options_nav, $the_index, $selected_item, $list_type );
 }
 
 /**
@@ -2544 +2601 @@
  * @return True if the current page is the blogs directory.
  */
 function bp_is_blogs_directory() {
-        if ( is_multisite() && bp_is_blogs_component() && ! bp_current_action() ) {
+        if ( is_multisite() && bp_is_blogs_component() && ! bp_current_action() && ! bp_current_item() ) {
+                return true;
+        }
+
+        return false;
+}
+
+/**
+ * Does the current page belong to a single blog ?
+ *
+ * Will return true for any subpage of a single blog.
+ *
+ * @since  BuddyPress (2.3.0)
+ *
+ * @return bool True if the current page is part of a single blog.
+ */
+function bp_is_blog() {
+        $retval = bp_is_active( 'blogs' );
+
+        if ( ! empty( $retval ) ) {
+                $retval = bp_is_blogs_component() && bp_blogs_get_current_blog();
+        }
+
+        return (bool) $retval;
+}
+
+/**
+ * Is the current page a single blog's home page?
+ *
+ * URL will vary depending on which blog tab is set to be the "home". By
+ * default, it's the blog's recent activity.
+ *
+ * @since  BuddyPress (2.3.0)
+ *
+ * @return bool True if the current page is a single blog's home page.
+ */
+function bp_is_blog_home() {
+        if ( bp_is_single_item() && bp_is_blogs_component() && ( ! bp_current_action() || bp_is_current_action( 'home' ) ) ) {
                 return true;
         }
 
         return false;
 }
 
+/**
+ * Is the current page a blog's activity page?
+ *
+ * Eg http://example.com/sites/mysite/activity/.
+ *
+ * @since  BuddyPress (2.3.0)
+ *
+ * @return bool True if the current page is a blog's activity page.
+ */
+function bp_is_blog_activity() {
+        return (bool) ( bp_is_blogs_component() && bp_is_current_action( 'activity' ) );
+}
+
+/**
+ * Is the current page a blog's members page?
+ *
+ * Eg http://example.com/sites/mysite/members/.
+ *
+ * @since  BuddyPress (2.3.0)
+ *
+ * @return bool True if the current page is a blog's members page.
+ */
+function bp_is_blog_members() {
+        return (bool) ( bp_is_blogs_component() && bp_is_current_action( 'members' ) );
+}
+
+/**
+ * Is the current page a blog's manage page?
+ *
+ * Eg http://example.com/sites/mysite/manage/.
+ *
+ * @since  BuddyPress (2.3.0)
+ *
+ * @return bool True if the current page is a blog's manage page.
+ */
+function bp_is_blog_manage() {
+        return (bool) ( bp_is_blogs_component() && bp_is_current_action( 'manage' ) );
+}
+
 /** Messages ******************************************************************/
 
 /**

src/bp-core/classes/class-bp-attachment-avatar.php

@@ -297 +297 @@
         }
 
         /**
+         * Get the blog id to set its avatar
+         *
+         * @since BuddyPress (2.3.0)
+         *
+         * @return integer the blog id
+         */
+        private function get_blog_id() {
+                $blog_id = 0;
+
+                if ( bp_is_blog() ) {
+                        $blog_id = bp_get_current_blog_id();
+                }
+
+                return $blog_id;
+        }
+
+        /**
          * Build script datas for the Uploader UI
          *
          * @since BuddyPress (2.3.0)
@@ -316 +333 @@
                 // Get the possible item ids
                 $user_id  = $this->get_user_id();
                 $group_id = $this->get_group_id();
+                $blog_id  = $this->get_blog_id();
 
                 if ( ! empty( $user_id ) ) {
                         // Should we load the the Webcam Avatar javascript file
@@ -358 +376 @@
                                 3 => __( 'There was a problem deleting the group profile photo. Please try again.', 'buddypress' ),
                                 4 => __( 'The group profile photo was deleted successfully!', 'buddypress' ),
                         );
+                } elseif( ! empty( $blog_id ) ) {
+                        $script_data['bp_params'] = array(
+                                'object'     => 'blog',
+                                'item_id'    => $blog_id,
+                                'has_avatar' => bp_get_blog_has_avatar( $blog_id ),
+                                'nonces'     => array(
+                                        'set'    => wp_create_nonce( 'bp_avatar_cropstore' ),
+                                        'remove' => wp_create_nonce( 'bp_delete_avatar_link' ),
+                                ),
+                        );
+
+                        // Set feedback messages
+                        $script_data['feedback_messages'] = array(
+                                1 => __( 'There was a problem cropping the site logo.', 'buddypress' ),
+                                2 => __( 'The site logo was uploaded successfully.', 'buddypress' ),
+                                3 => __( 'There was a problem deleting the site logo. Please try again.', 'buddypress' ),
+                                4 => __( 'The site logo was deleted successfully!', 'buddypress' ),
+                        );
                 } else {
                         /**
                          * Use this filter to include specific BuddyPress params for your object
-                         * e.g. Blavatar
                          *
                          * @since BuddyPress (2.3.0)
                          *

src/bp-friends/bp-friends-template.php

@@ -211 +211 @@
         bp_add_friend_button( bp_get_member_user_id() );
 }
 add_action( 'bp_directory_members_actions', 'bp_member_add_friend_button' );
+add_action( 'bp_blog_members_actions', 'bp_member_add_friend_button' );
 
 /**
  * Output the friend count for the current member in the loop.

src/bp-members/bp-members-functions.php

@@ -1901 +1901 @@
 
                 $user_id = $user['user_id'];
 
+                /**
+                 * If it's a blog signup and site logos are enabled
+                 * save a transient so that the user once loggedin will
+                 * be redirected to the edit-logo manage page of his site
+                 */
+                if ( ! empty( $user['blog_id'] ) && bp_is_active( 'blogs' ) ) {
+                        // Taking no risk
+                        if ( bp_blogs_is_avatar_uploads_enabled() ) {
+                                $transient_key = sprintf( '_bp_activation_%d_redirect', $user_id );
+
+                                // Five minutes should be ok.
+                                set_transient( $transient_key, intval( $user['blog_id'] ), 300 );
+                        }
+                }
+
         } else {
                 $signups = BP_Signup::get( array(
                         'activation_key' => $key,

src/bp-templates/bp-legacy/buddypress/activity/index.php

@@ -86 +86 @@
 
                                 <?php endif; ?>
 
+                                <?php if ( bp_is_active( 'blogs' ) && ! bp_blogs_disable_single_items() ) : ?>
+
+                                        <?php if ( bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
+
+                                                <li id="activity-blogs"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_blogs_slug() . '/'; ?>" title="<?php esc_attr_e( 'The activity of sites I am a member of.', 'buddypress' ); ?>"><?php printf( __( 'My Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
+
+                                        <?php endif; ?>
+
+                                <?php endif; ?>
+
                                 <?php
 
                                 /**

src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php

@@ -39 +39 @@
         <# } else if ( 'group' === data.object ) { #>
                 <p><?php _e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
                 <p><a class="button edit" id="bp-delete-avatar" href="#" title="<?php esc_attr_e( 'Delete Group Profile Photo', 'buddypress' ); ?>"><?php esc_html_e( 'Delete Group Profile Photo', 'buddypress' ); ?></a></p>
+        <# } else if ( 'blog' === data.object ) { #>
+                <p><?php _e( "If you'd like to remove the existing site logo but not upload a new one, please use the delete site logo button.", 'buddypress' ); ?></p>
+                <p><a class="button edit" id="bp-delete-avatar" href="#" title="<?php esc_attr_e( 'Delete Site Logo', 'buddypress' ); ?>"><?php esc_html_e( 'Delete Site Logo', 'buddypress' ); ?></a></p>
         <# } else { #>
                 <?php do_action( 'bp_attachments_avatar_delete_template' ); ?>
         <# } #>

src/bp-templates/bp-legacy/buddypress/blogs/single/activity.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blog single item activity
+ *
+ * @since 2.3
+ *
+ * @package BuddyPress
+ * @subpackage blogs
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<div class="item-list-tabs no-ajax" id="subnav" role="navigation">
+        <ul>
+                <?php do_action( 'bp_blog_activity_syndication_options' ); ?>
+
+                <li id="activity-filter-select" class="last">
+                        <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
+                        <select id="activity-filter-by">
+                                <option value="-1"><?php _e( '&mdash; Everything &mdash;', 'buddypress' ); ?></option>
+
+                                <?php bp_activity_show_filters( 'blog' ); ?>
+                        </select>
+                </li>
+        </ul>
+</div><!-- .item-list-tabs -->
+
+<?php do_action( 'bp_before_blog_activity_content' ); ?>
+
+<div class="activity single-blog" role="main">
+
+        <?php if ( bp_current_blog_is_public() ) :
+                bp_get_template_part( 'activity/activity-loop' );
+
+                else : ?>
+
+                <div id="message" class="info">
+                        <p><?php _e( 'Sorry, as this site is private, no activity are available.', 'buddypress' ); ?></p>
+                </div>
+
+        <?php endif; ?>
+
+</div><!-- .activity.single-blog -->
+
+<?php do_action( 'bp_after_blog_activity_content' ); ?>

src/bp-templates/bp-legacy/buddypress/blogs/single/blog-header.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blog single item header
+ *
+ * @since 2.3
+ *
+ * @package BuddyPress
+ * @subpackage blogs
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<?php do_action( 'bp_before_blog_header' ); ?>
+
+<div id="item-actions">
+
+        <?php bp_current_blog_admins();
+
+        do_action( 'bp_after_blog_menu_admins' ); ?>
+
+</div><!-- #item-actions -->
+
+<div id="item-header-avatar">
+        <a href="<?php bp_blog_view_details_link(); ?>" title="<?php bp_blog_name(); ?>">
+
+                <?php bp_blog_avatar(); ?>
+
+        </a>
+</div><!-- #item-header-avatar -->
+
+<div id="item-header-content">
+        <span class="highlight"><?php bp_current_blog_type(); ?></span>
+        <span class="activity"><?php bp_blog_last_active(); ?></span>
+
+        <?php do_action( 'bp_before_blog_header_meta' ); ?>
+
+        <div id="item-meta">
+
+                <?php bp_blog_description(); ?>
+
+                <div id="item-buttons">
+
+                        <?php do_action( 'bp_blog_header_actions' ); ?>
+
+                </div><!-- #item-buttons -->
+
+                <?php do_action( 'bp_blog_header_meta' ); ?>
+
+        </div>
+</div><!-- #item-header-content -->
+
+<?php
+do_action( 'bp_after_blog_header' );
+do_action( 'template_notices' );
+?>

src/bp-templates/bp-legacy/buddypress/blogs/single/home.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blog single item home page
+ *
+ * @since 2.3
+ *
+ * @package BuddyPress
+ * @subpackage blogs
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<div id="buddypress">
+
+        <?php if ( bp_has_blogs() ) : while ( bp_blogs() ) : bp_the_blog(); ?>
+
+        <?php do_action( 'bp_before_blog_home_content' ); ?>
+
+        <div id="item-header" role="complementary">
+
+                <?php bp_get_template_part( 'blogs/single/blog-header' ); ?>
+
+        </div><!-- #item-header -->
+
+        <div id="item-nav">
+                <div class="item-list-tabs no-ajax" id="object-nav" role="navigation">
+                        <ul>
+
+                                <?php bp_component_main_nav( 'blogs' ); ?>
+
+                                <?php do_action( 'bp_blog_main_nav' ); ?>
+
+                        </ul>
+                </div>
+        </div><!-- #item-nav -->
+
+        <div id="item-body">
+
+                <?php do_action( 'bp_before_blog_body' );
+
+                /**
+                 * Does this next bit look familiar? If not, go check out WordPress's
+                 */
+
+                        // Looking at home location
+                        if ( bp_is_blog_home() ) :
+
+                                if ( bp_current_blog_has_access() ) {
+
+                                        // Load the appropriate front template
+                                        bp_blogs_load_blog_front_template();
+
+                                } else {
+
+                                        /**
+                                         * Fires before the display of the blog status message.
+                                         *
+                                         * @since BuddyPress (2.3.0)
+                                         */
+                                        do_action( 'bp_before_blog_status_message' ); ?>
+
+                                        <div id="message" class="info">
+                                                <p><?php bp_blog_status_message(); ?></p>
+                                        </div>
+
+                                        <?php
+
+                                        /**
+                                         * Fires after the display of the blog status message.
+                                         *
+                                         * @since BuddyPress (2.3.0)
+                                         */
+                                        do_action( 'bp_after_blog_status_message' );
+
+                                }
+
+                        // Not looking at home
+                        else :
+
+                                // Blog manage
+                                if     ( bp_is_blog_manage()   ) : bp_get_template_part( 'blogs/single/manage'   );
+
+                                // Blog Activity
+                                elseif ( bp_is_blog_activity() ) : bp_get_template_part( 'blogs/single/activity' );
+
+                                // Blog Members
+                                elseif ( bp_is_blog_members()  ) : bp_get_template_part( 'blogs/single/members'  );
+
+                                // Anything else (plugins mostly)
+                                else                             : bp_get_template_part( 'blogs/single/plugins'  );
+
+                                endif;
+
+                        endif;
+
+                do_action( 'bp_after_blog_body' ); ?>
+
+        </div><!-- #item-body -->
+
+        <?php do_action( 'bp_after_blog_home_content' ); ?>
+
+        <?php endwhile; endif; ?>
+
+</div><!-- #buddypress -->

src/bp-templates/bp-legacy/buddypress/blogs/single/manage.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blog single item manage page
+ *
+ * @since 2.3
+ *
+ * @package BuddyPress
+ * @subpackage blogs
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<div class="item-list-tabs no-ajax" id="subnav" role="navigation">
+        <ul>
+                <?php if ( bp_is_item_admin() ) : ?>
+
+                        <?php bp_blogs_item_subnav();?>
+
+                <?php endif; ?>
+        </ul>
+</div>
+
+<?php
+$action = bp_action_variable( 0 ) ? bp_action_variable( 0 ) : bp_current_action();
+
+switch ( $action ) :
+        case 'manage'  :
+                bp_get_template_part( 'blogs/single/settings/general' );
+                break;
+        case 'edit-logo'   :
+                bp_get_template_part( 'blogs/single/settings/logo'   );
+                break;
+        case 'members'   :
+                bp_get_template_part( 'blogs/single/settings/members'   );
+                break;
+        default:
+                bp_get_template_part( 'blogs/single/plugins'          );
+                break;
+endswitch;

src/bp-templates/bp-legacy/buddypress/blogs/single/members-loop.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blog single item members loop
+ *
+ * @since 2.3
+ *
+ * @package BuddyPress
+ * @subpackage blogs
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<?php if ( bp_blog_has_members( bp_ajax_querystring( 'blog_members' ) ) ) : ?>
+
+        <?php
+
+        /**
+         * Fires before the display of the blog members content.
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        do_action( 'bp_before_blog_members_content' ); ?>
+
+        <div id="pag-top" class="pagination">
+
+                <div class="pag-count" id="member-count-top">
+
+                        <?php bp_members_pagination_count(); ?>
+
+                </div>
+
+                <div class="pagination-links" id="member-pag-top">
+
+                        <?php bp_members_pagination_links(); ?>
+
+                </div>
+
+        </div>
+
+        <?php
+
+        /**
+         * Fires before the display of the blog members list.
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        do_action( 'bp_before_blog_members_list' ); ?>
+
+        <ul id="member-list" class="item-list" role="main">
+
+                <?php while ( bp_blog_members() ) : bp_blog_the_member(); ?>
+
+                        <li>
+                                <div class="item-avatar">
+                                        <a href="<?php bp_blog_member_permalink(); ?>"><?php bp_blog_member_avatar(); ?></a>
+                                </div>
+
+                                <div class="item">
+                                        <div class="item-title">
+                                                <a href="<?php bp_blog_member_permalink(); ?>"><?php bp_blog_member_name(); ?></a>
+
+                                                <?php if ( bp_blog_get_member_latest_update() ) : ?>
+
+                                                        <span class="update"> <?php bp_blog_member_latest_update(); ?></span>
+
+                                                <?php endif; ?>
+
+                                        </div>
+
+                                        <div class="item-meta"><span class="activity"><?php bp_blog_member_last_active(); ?></span></div>
+
+                                        <?php do_action( 'bp_blog_members_item' ); ?>
+                                </div>
+
+                                <div class="action">
+
+                                        <?php do_action( 'bp_blog_members_actions' ); ?>
+
+                                </div>
+
+                                <div class="clear"></div>
+                        </li>
+
+                <?php endwhile; ?>
+
+        </ul>
+
+        <?php
+
+        /**
+         * Fires after the display of the blog members list.
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        do_action( 'bp_after_blog_members_list' ); ?>
+
+        <div id="pag-bottom" class="pagination">
+
+                <div class="pag-count" id="member-count-bottom">
+
+                        <?php bp_members_pagination_count(); ?>
+
+                </div>
+
+                <div class="pagination-links" id="member-pag-bottom">
+
+                        <?php bp_members_pagination_links(); ?>
+
+                </div>
+
+        </div>
+
+        <?php
+
+        /**
+         * Fires after the display of the blog members content.
+         *
+         * @since BuddyPress (2.3.0)
+         */
+        do_action( 'bp_after_blog_members_content' ); ?>
+
+<?php else: ?>
+
+        <div id="message" class="info">
+                <p><?php _e( 'No members were found.', 'buddypress' ); ?></p>
+        </div>
+
+<?php endif; ?>

src/bp-templates/bp-legacy/buddypress/blogs/single/members.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blog single item members
+ *
+ * @since 2.3
+ *
+ * @package BuddyPress
+ * @subpackage blogs
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<form action="" method="post" id="members-blog-form" class="dir-form">
+
+        <div class="item-list-tabs" id="subnav" role="navigation">
+                <ul>
+                        <?php bp_blogs_item_subnav();?>
+
+                        <?php do_action( 'bp_members_blog_member_sub_types' ); ?>
+
+                        <li id="members-order-select" class="last filter">
+                                <label for="members-order-by"><?php _e( 'Order By:', 'buddypress' ); ?></label>
+                                <select id="members-order-by">
+                                        <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
+
+                                        <?php if ( bp_is_active( 'xprofile' ) ) : ?>
+                                                <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
+                                        <?php endif; ?>
+
+                                        <?php do_action( 'bp_members_blog_order_options' ); ?>
+                                </select>
+                        </li>
+                </ul>
+        </div>
+
+        <div id="blog-list" class="members item-list">
+                <?php bp_get_template_part( 'blogs/single/members-loop' ); ?>
+        </div><!-- #members-dir-list -->
+
+        <?php do_action( 'bp_blog_members_content' ); ?>
+
+        <?php wp_nonce_field( 'blog_members', '_wpnonce-member-filter' ); ?>
+
+        <?php do_action( 'bp_after_blog_members_content' ); ?>
+
+</form><!-- #members-directory-form -->
+
+<?php do_action( 'bp_after_blog_members' ); ?>

src/bp-templates/bp-legacy/buddypress/blogs/single/plugins.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blog single item plugins
+ *
+ * @since 2.3
+ *
+ * @package BuddyPress
+ * @subpackage blogs
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<?php do_action( 'bp_before_blog_plugin_template' ); ?>
+
+<div class="item-list-tabs no-ajax" id="subnav">
+        <ul>
+                <?php bp_blogs_item_subnav();?>
+
+                <?php do_action( 'bp_blog_plugin_sub_nav' ); ?>
+        </ul>
+</div><!-- .item-list-tabs -->
+
+<h3><?php do_action( 'bp_template_title' ); ?></h3>
+
+<?php do_action( 'bp_template_content' ); ?>
+
+<?php do_action( 'bp_after_blog_plugin_template' ); ?>

src/bp-templates/bp-legacy/buddypress/blogs/single/settings/general.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blog single item settings
+ *
+ * @since 2.3
+ *
+ * @package BuddyPress
+ * @subpackage blogs
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<?php do_action( 'bp_before_blog_settings_template' ); ?>
+
+<form action="" method="post" class="standard-form" id="settings-form">
+
+        <h4><?php esc_html_e( 'General settings', 'buddypress' ); ?></h4>
+
+        <label for="blog_name"><?php esc_html_e( 'Site Name', 'buddypress' ); ?></label>
+        <input type="text" name="bp_blog[blogname]" id="blog_name" value="<?php echo esc_attr( bp_get_blog_name() ); ?>" class="settings-input" />
+        <p class="description"><?php esc_html_e( 'This setting is synchronized with the corresponding WordPress setting.', 'buddypress' ); ?></p>
+
+        <label for="blog_description"><?php esc_html_e( 'Site Description', 'buddypress' ); ?></label>
+        <input type="text" name="bp_blog[blogdescription]" id="blog_description" value="<?php echo esc_html( bp_get_blog_description() ); ?>" class="settings-input" />
+        <p class="description"><?php esc_html_e( 'This setting is synchronized with the corresponding WordPress setting.', 'buddypress' ); ?></p>
+
+        <label for="blog_public">
+                <input type="checkbox" name="bp_blog[blog_public]" id="blog_public" value="1" <?php checked( true, bp_current_blog_is_public() ); ?> />
+                <?php esc_html_e( 'Public site', 'buddypress' ); ?>
+        </label>
+        <p class="description"><?php esc_html_e( 'This setting is synchronized with the &quot;Discourage search engines from indexing this site&quot; WordPress setting.', 'buddypress' ); ?></p>
+        <p class="description"><?php esc_html_e( 'If you deactivate this option, post types tracking and subscriptions will not be available for your site.', 'buddypress' ); ?></p>
+
+        <?php if ( bp_current_blog_is_public() ) : ?>
+                <label for="blog_disallow_subscriptions">
+                        <input type="checkbox" name="bp_blog[disallow_subscriptions]" id="blog_disallow_subscriptions" value="1" <?php checked( true, ! bp_current_blog_can_subscribe() ); ?> />
+                        <?php esc_html_e( 'Disallow subscritions', 'buddypress' ); ?>
+                </label>
+                <p class="description"><?php esc_html_e( 'Subscriptions are only available for public sites', 'buddypress' ); ?></p>
+        <?php endif ; ?>
+
+        <?php do_action( 'bp_blog_settings_after_general' ); ?>
+
+        <div class="submit">
+                <input type="submit" name="bp_blog[submit]" value="<?php esc_attr_e( 'Save Changes', 'buddypress' ); ?>" id="submit" class="auto" />
+        </div>
+
+        <?php do_action( 'bp_blog_settings_after_submit' ); ?>
+
+        <?php wp_nonce_field( 'blog_settings_general' ); ?>
+
+</form>
+
+<?php do_action( 'bp_after_blog_settings_template' ); ?>

src/bp-templates/bp-legacy/buddypress/blogs/single/settings/logo.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blog single item edit logo
+ *
+ * @since 2.3
+ *
+ * @package BuddyPress
+ * @subpackage blogs
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<?php do_action( 'bp_before_blog_avatar_upload_content' ); ?>
+
+<p><?php esc_html_e( "Upload an image to use as a logo for this site. The image will be shown on the site&#39;s details page, and in search results.", 'buddypress' ); ?></p>
+
+<?php bp_avatar_get_templates(); ?>
+
+<?php do_action( 'bp_after_blog_avatar_upload_content' ); ?>

src/bp-templates/bp-legacy/buddypress/blogs/single/settings/members.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blog single item manage members
+ *
+ * @since 2.3
+ *
+ * @package BuddyPress
+ * @subpackage blogs
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) or die; ?>
+
+<form action="" method="post" id="members-blog-form" class="dir-form">
+
+        <div class="item-list-tabs" id="subnav" role="navigation">
+                <ul>
+
+                        <?php do_action( 'bp_members_blog_member_sub_types' ); ?>
+
+                        <li id="members-order-select" class="last filter">
+                                <label for="members-order-by"><?php _e( 'Order By:', 'buddypress' ); ?></label>
+                                <select id="members-order-by">
+                                        <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
+
+                                        <?php if ( bp_is_active( 'xprofile' ) ) : ?>
+                                                <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
+                                        <?php endif; ?>
+
+                                        <?php do_action( 'bp_members_blog_order_options' ); ?>
+                                </select>
+                        </li>
+                </ul>
+        </div>
+
+        <div id="blog-list" class="members item-list">
+
+                <?php if ( bp_blog_has_members( bp_ajax_querystring( 'blog_members' ) ) ) : ?>
+
+                        <?php
+
+                        /**
+                         * Fires before the display of the blog members content.
+                         *
+                         * @since BuddyPress (2.3.0)
+                         */
+                        do_action( 'bp_before_blog_members_manage_content' ); ?>
+
+                        <div id="pag-top" class="pagination">
+
+                                <div class="pag-count" id="member-count-top">
+
+                                        <?php bp_members_pagination_count(); ?>
+
+                                </div>
+
+                                <div class="pagination-links" id="member-pag-top">
+
+                                        <?php bp_members_pagination_links(); ?>
+
+                                </div>
+
+                        </div>
+
+                        <?php
+
+                        /**
+                         * Fires before the display of the blog members list.
+                         *
+                         * @since BuddyPress (2.3.0)
+                         */
+                        do_action( 'bp_before_blog_members_manage_list' ); ?>
+
+                        <ul id="member-list" class="item-list" role="main">
+
+                                <?php while ( bp_blog_members() ) : bp_blog_the_member(); ?>
+
+                                        <li>
+                                                <div class="item-avatar">
+                                                        <a href="<?php bp_blog_member_permalink(); ?>"><?php bp_blog_member_avatar(); ?></a>
+                                                </div>
+
+                                                <div class="item">
+                                                        <div class="item-title">
+                                                                <a href="<?php bp_blog_member_permalink(); ?>"><?php bp_blog_member_name(); ?></a>
+                                                        </div>
+
+                                                        <div class="item-meta"><span class="activity"><?php bp_blog_member_last_active(); ?></span></div>
+
+                                                        <?php do_action( 'bp_blog_members_manage_item' ); ?>
+                                                </div>
+
+                                                <div class="action">
+
+                                                        <?php bp_blog_member_remove_button() ;?>
+
+                                                        <?php do_action( 'bp_blog_members__manage_actions' ); ?>
+
+                                                </div>
+
+                                                <div class="clear"></div>
+                                        </li>
+
+                                <?php endwhile; ?>
+
+                        </ul>
+
+                        <?php
+
+                        /**
+                         * Fires after the display of the blog members list.
+                         *
+                         * @since BuddyPress (2.3.0)
+                         */
+                        do_action( 'bp_after_blog_members_manage_list' ); ?>
+
+                        <div id="pag-bottom" class="pagination">
+
+                                <div class="pag-count" id="member-count-bottom">
+
+                                        <?php bp_members_pagination_count(); ?>
+
+                                </div>
+
+                                <div class="pagination-links" id="member-pag-bottom">
+
+                                        <?php bp_members_pagination_links(); ?>
+
+                                </div>
+
+                        </div>
+
+                        <?php
+
+                        /**
+                         * Fires after the display of the blog members content.
+                         *
+                         * @since BuddyPress (2.3.0)
+                         */
+                        do_action( 'bp_after_blog_members_manage_content' ); ?>
+
+                <?php else: ?>
+
+                        <div id="message" class="info">
+                                <p><?php _e( 'No members were found.', 'buddypress' ); ?></p>
+                        </div>
+
+                <?php endif; ?>
+
+        </div><!-- #members-dir-list -->
+
+        <?php do_action( 'bp_blog_members_manage_content' ); ?>
+
+        <?php wp_nonce_field( 'blog_members', '_wpnonce-member-filter' ); ?>
+
+        <?php do_action( 'bp_after_blog_members_manage_content' ); ?>
+
+</form><!-- #members-directory-form -->
+
+<?php do_action( 'bp_after_blog_members_manage' ); ?>

src/bp-templates/bp-legacy/css/buddypress.css

@@ -796 +796 @@
         text-decoration: none;
 }
 
+#buddypress div.blog-button {
+        display: inline-block;
+        margin-left: 5px;
+}
+
 #buddypress form.standard-form .left-menu {
         float: left;
 }

tests/phpunit/testcases/core/nav.php

@@ -5 +5 @@
  * @group nav
  */
 class BP_Tests_Core_Nav extends BP_UnitTestCase {
+
+        /**
+         * @group bp_core_new_nav_item
+         */
+        public function test_bp_core_new_nav_item_user_nav() {
+                $bp_nav = buddypress()->bp_nav;
+
+                $u = $this->factory->user->create();
+                $old_current_user = get_current_user_id();
+                $this->set_current_user( $u );
+
+                $this->go_to( bp_core_get_user_domain( $u ) );
+
+                bp_core_new_nav_item( array(
+                        'name'                    => 'Foo',
+                        'slug'                    => 'foo',
+                        'position'                => 25,
+                        'screen_function'         => 'foo_screen_function',
+                        'default_subnav_slug'     => 'foo-sub'
+                ) );
+
+                $expected = array(
+                        'name'                    => 'Foo',
+                        'slug'                    => 'foo',
+                        'link'                    => trailingslashit( bp_core_get_user_domain( $u ) . 'foo' ),
+                        'css_id'                  => 'foo',
+                        'show_for_displayed_user' => true,
+                        'position'                => 25,
+                        'screen_function'         => 'foo_screen_function',
+                        'default_subnav_slug'     => 'foo-sub'
+                );
+
+                $this->assertSame( buddypress()->bp_nav['foo'], $expected );
+
+                // Clean up
+                buddypress()->bp_nav = $bp_nav;
+                $this->set_current_user( $old_current_user );
+        }
+
+        /**
+         * @group bp_core_new_nav_item
+         */
+        public function test_bp_core_new_nav_item_group_nav() {
+                $bp_nav = buddypress()->bp_nav;
+
+                $u = $this->factory->user->create();
+                $g = $this->factory->group->create();
+                $old_current_user = get_current_user_id();
+                $this->set_current_user( $u );
+
+                $group = groups_get_group( array(
+                        'group_id' => $g,
+                ) );
+
+                $this->go_to( bp_get_group_permalink( $group ) );
+
+                $this->assertTrue( buddypress()->bp_nav[ $group->slug ]['position'] === -1 );
+
+                // Clean up
+                buddypress()->bp_nav = $bp_nav;
+                $this->set_current_user( $old_current_user );
+        }
+
+        /**
+         * @group bp_core_new_nav_item
+         */
+        public function test_bp_core_new_nav_item_foo_nav() {
+                $bp = buddypress();
+                $reset_active_components = $bp->active_components;
+                $reset_current_component = $bp->current_component;
+                $reset_current_item      = $bp->current_item;
+                $bp_nav = buddypress()->bp_nav;
+
+                if ( ! function_exists( 'bp_get_foo_root_slug') ) {
+                        function bp_get_foo_root_slug() {
+                                return 'foo';
+                        }
+                }
+
+                // Create and activate the foo component
+                $bp->foo                = new BP_Component;
+                $bp->foo->id            = 'foo';
+                $bp->foo->slug          = 'foo';
+                $bp->foo->name          = 'Foo';
+                $bp->foo->single_nav    = array();
+                $bp->active_components[ $bp->foo->id ] = 1;
+
+                $bp->current_component = 'foo';
+                $bp->current_item = 'single-foo';
+
+                bp_core_new_nav_item( array(
+                        'name'                    => 'Bar',
+                        'slug'                    => 'bar',
+                        'position'                => 10,
+                        'screen_function'         => 'bar_screen_function',
+                        'default_subnav_slug'     => 'bar-sub',
+                        'single_nav'              => $bp->foo->id
+                ) );
+
+                $expected = array(
+                        'name'                    => 'Bar',
+                        'slug'                    => 'bar',
+                        'link'                    => trailingslashit( bp_get_root_domain() . '/foo/single-foo/bar' ),
+                        'css_id'                  => 'bar',
+                        'show_for_displayed_user' => true,
+                        'position'                => 10,
+                        'screen_function'         => 'bar_screen_function',
+                        'default_subnav_slug'     => 'bar-sub'
+                );
+
+                $this->assertTrue( empty( $bp->bp_nav['bar'] ) );
+                $this->assertSame( $bp->foo->single_nav['bar'], $expected );
+
+                // Clean up
+                $bp->foo->single_nav = array();
+                $bp->active_components = $reset_active_components;
+                $bp->current_component = $reset_current_component;
+                $bp->current_item = $reset_current_item;
+        }
+
+        /**
+         * @group bp_core_sort_nav_items
+         */
+        public function test_bp_core_sort_nav_items() {
+                $bp_nav = buddypress()->bp_nav;
+
+                $u = $this->factory->user->create();
+                $old_current_user = get_current_user_id();
+                $this->set_current_user( $u );
+
+                $this->go_to( bp_core_get_user_domain( $u ) );
+
+                bp_core_new_nav_item( array(
+                        'name'                    => 'Foo',
+                        'slug'                    => 'foo',
+                        'position'                => 25,
+                        'screen_function'         => 'foo_screen_function',
+                        'default_subnav_slug'     => 'foo-sub'
+                ) );
+
+                $expected = array(
+                        'name'                    => 'Foo',
+                        'slug'                    => 'foo',
+                        'link'                    => trailingslashit( bp_core_get_user_domain( $u ) . 'foo' ),
+                        'css_id'                  => 'foo',
+                        'show_for_displayed_user' => true,
+                        'position'                => 25,
+                        'screen_function'         => 'foo_screen_function',
+                        'default_subnav_slug'     => 'foo-sub'
+                );
+
+                bp_core_sort_nav_items();
+
+                $this->assertSame( buddypress()->bp_nav[25], $expected );
+
+                // Clean up
+                buddypress()->bp_nav = $bp_nav;
+                $this->set_current_user( $old_current_user );
+        }
+
+        /**
+         * @group bp_core_new_subnav_item
+         */
+        public function test_bp_core_new_subnav_item_user_subnav() {
+                $bp_options_nav = buddypress()->bp_options_nav;
+
+                $u = $this->factory->user->create();
+                $old_current_user = get_current_user_id();
+                $this->set_current_user( $u );
+
+                $user_domain = bp_core_get_user_domain( $u );
+
+                $this->go_to( $user_domain );
+
+                bp_core_new_subnav_item( array(
+                        'name'            => 'Foo',
+                        'slug'            => 'foo',
+                        'parent_url'      => trailingslashit( $user_domain . 'foo' ),
+                        'parent_slug'     => 'foo',
+                        'screen_function' => 'foo_screen_function',
+                        'position'        => 10
+                ) );
+
+                $expected = array(
+                        'name'              => 'Foo',
+                        'link'              => trailingslashit( $user_domain . 'foo/foo' ),
+                        'slug'              => 'foo',
+                        'css_id'            => 'foo',
+                        'position'          => 10,
+                        'user_has_access'   => true,
+                        'no_access_url'     => '',
+                        'screen_function'   => 'foo_screen_function',
+                        'show_in_admin_bar' => false,
+                );
+
+                $this->assertSame( buddypress()->bp_options_nav['foo']['foo'], $expected );
+
+                // Clean up
+                buddypress()->bp_options_nav = $bp_options_nav;
+                $this->set_current_user( $old_current_user );
+        }
+
+        /**
+         * @group bp_core_new_nav_item
+         */
+        public function test_bp_core_new_subnav_item_foo_subnav() {
+                $bp = buddypress();
+                $reset_active_components = $bp->active_components;
+
+                // Create and activate the foo component
+                $bp->foo                = new BP_Component;
+                $bp->foo->id            = 'foo';
+                $bp->foo->slug          = 'foo';
+                $bp->foo->name          = 'Foo';
+                $bp->foo->single_nav    = array();
+                $bp->foo->single_subnav = array();
+                $bp->active_components[ $bp->foo->id ] = 1;
+
+                bp_core_new_subnav_item( array(
+                        'name'            => 'Bar',
+                        'slug'            => 'bar',
+                        'parent_url'      => trailingslashit( bp_get_root_domain() . '/foo/single-foo/bar' ),
+                        'parent_slug'     => 'bar',
+                        'screen_function' => 'bar_screen_function',
+                        'position'        => 10,
+                        'single_subnav'   => $bp->foo->id
+                ) );
+
+                $expected = array(
+                        'name'              => 'Bar',
+                        'link'              => trailingslashit( bp_get_root_domain() . '/foo/single-foo/bar/bar' ),
+                        'slug'              => 'bar',
+                        'css_id'            => 'bar',
+                        'position'          => 10,
+                        'user_has_access'   => true,
+                        'no_access_url'     => '',
+                        'screen_function'   => 'bar_screen_function',
+                        'show_in_admin_bar' => false,
+                );
+
+                $this->assertTrue( empty( $bp->bp_options_nav['bar'] ) );
+                $this->assertSame( $bp->foo->single_subnav['bar']['bar'], $expected );
+
+                // Clean up
+                $bp->foo->single_subnav = array();
+                $bp->active_components = $reset_active_components;
+        }
+
+
         /**
          * @group bp_core_new_subnav_item
          */
@@ -400 +649 @@
 
                 $this->assertSame( $link, buddypress()->bp_options_nav['foo']['bar']['link'] );
         }
+
+        /**
+         * @group bp_core_sort_subnav_items
+         */
+        public function test_bp_core_sort_subnav_items() {
+                $bp_options_nav = buddypress()->bp_options_nav;
+
+                $u = $this->factory->user->create();
+                $old_current_user = get_current_user_id();
+                $this->set_current_user( $u );
+
+                $user_domain = bp_core_get_user_domain( $u );
+
+                $this->go_to( $user_domain );
+
+                bp_core_new_subnav_item( array(
+                        'name'            => 'Foo',
+                        'slug'            => 'foo',
+                        'parent_url'      => trailingslashit( $user_domain . 'foo' ),
+                        'parent_slug'     => 'foo',
+                        'screen_function' => 'foo_screen_function',
+                        'position'        => 10
+                ) );
+
+                bp_core_sort_subnav_items();
+
+                $expected = array(
+                        'name'              => 'Foo',
+                        'link'              => trailingslashit( $user_domain . 'foo/foo' ),
+                        'slug'              => 'foo',
+                        'css_id'            => 'foo',
+                        'position'          => 10,
+                        'user_has_access'   => true,
+                        'no_access_url'     => '',
+                        'screen_function'   => 'foo_screen_function',
+                        'show_in_admin_bar' => false,
+                );
+
+                $this->assertSame( buddypress()->bp_options_nav['foo'][10], $expected );
+
+                // Clean up
+                buddypress()->bp_options_nav = $bp_options_nav;
+                $this->set_current_user( $old_current_user );
+        }
 }