Ticket #6026: 6026.03.patch

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

@@ -226 +226 @@
                         );
                 }
 
+                // Additional menu if blogs single item is active
+                if ( bp_is_active( 'blogs', 'blog' ) ) {
+                        $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 );
         }
 
@@ -321 +334 @@
                                         'href'   => trailingslashit( $activity_link . bp_get_groups_slug() )
                                 );
                         }
+
+                        // Blogs single item ?
+                        if ( bp_is_active( 'blogs', 'blog' ) ) {
+                                $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

@@ -148 +148 @@
         bp_core_load_template( apply_filters( 'bp_activity_template_groups_activity', 'members/single/home' ) );
 }
 
+ /**
+ * Load the 'My Blogs' activity page.
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_activity_screen_blogs() {
+        if ( ! bp_is_active( 'blogs', 'blog' ) ) {
+                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.4.0)
+         */
+        do_action( 'bp_activity_screen_blogs' );
+
+        /**
+         * Filters the template to load for the "My Blogs" screen.
+         *
+         * @since BuddyPress (2.4.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.
  *

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_blogs_blog_get_current_blog_id();
+                $show_hidden = false;
         } else {
                 $object      = false;
                 $primary_id  = false;
@@ -4462 +4466 @@
                         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', 'blog' ) && bp_is_current_action( bp_get_blogs_slug() ) ) {
+                                        $context = 'member_blogs';
                                 } else {
                                         $context = 'member';
                                 }

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

@@ -45 +45 @@
                         __( '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
                 );
         }

src/bp-blogs/bp-blogs-adminbar.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Blogs Toolbar.
+ *
+ * Handles the blogs functions related to the WordPress Toolbar.
+ *
+ * @package BuddyPress
+ * @subpackage Blogs
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Add the Blog Admin top-level menu when viewing blog pages.
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @return false|null False if not on a blog page, or if user does not have
+ *                    access to blog admin options.
+ */
+function bp_blogs_blog_admin_menu() {
+        global $wp_admin_bar;
+        $bp = buddypress();
+
+        // Only show if viewing a group
+        if ( ! bp_is_blog() || bp_is_create_blog() ) {
+                return false;
+        }
+
+        // Bail if nav is not set
+        if ( ! is_a( $bp->blogs->nav, 'BP_Single_Item_Navigation' ) ) {
+                return false;
+        }
+
+        // Only show this menu to blog admins and super admins
+        if ( ! bp_current_user_can( 'bp_moderate' ) && ! bp_is_item_admin() ) {
+                return false;
+        }
+
+        // Unique ID for the 'Edit Blog' menu
+        $blog_manage_menu_id = 'blog-admin';
+        $blog_manage_link    = trailingslashit( bp_blogs_blog_get_view_details_link() . 'manage' );
+
+        // Add the top-level Group Admin button
+        $wp_admin_bar->add_menu( array(
+                'id'    => $blog_manage_menu_id,
+                'title' => __( 'Edit Blog', 'buddypress' ),
+                'href'  => $blog_manage_link,
+        ) );
+
+        // Get the Manage sub nav
+        $manage_sub_nav = $bp->blogs->nav->get_sub_nav_by_parent_slug( 'manage' );
+
+        // Check if current blog has Manage tabs
+        if ( empty( $manage_sub_nav ) ) {
+                return;
+        }
+
+        // Build the Group Admin menus
+        foreach ( $manage_sub_nav as $menu ) {
+                /**
+                 * Should we add the current manage link in the Blog's "Edit" Admin Bar menu ?
+                 */
+                if ( $menu['show_in_admin_bar'] ) {
+                        $title = sprintf( _x( 'Edit Blog %s', 'Group WP Admin Bar manage links', 'buddypress' ), $menu['name'] );
+
+                        $wp_admin_bar->add_menu( array(
+                                'parent' => $blog_manage_menu_id,
+                                'id'     => $menu['slug'],
+                                'title'  => $title,
+                                'href'   => trailingslashit( $blog_manage_link . $menu['slug'] ),
+                        ) );
+                }
+        }
+
+        // Finally add a link to the WP Administration
+        $wp_admin_bar->add_menu( array(
+                'parent' => $blog_manage_menu_id,
+                'id'     => 'wp-dashboard',
+                'title'  => __( 'Dashboard', 'buddypress' ),
+                'href'   => get_admin_url( bp_blogs_blog_get_current_blog_id() ),
+        ) );
+}
+add_action( 'admin_bar_menu', 'bp_blogs_blog_admin_menu', 99 );
+
+/**
+ * Remove rogue WP core Edit menu when viewing a single blog.
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blogs_blog_remove_edit_page_menu() {
+        if ( bp_is_blog() ) {
+                remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+        }
+}
+add_action( 'admin_bar_init', 'bp_blogs_blog_remove_edit_page_menu', 200 );

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

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Blogs Blog (single item) feature.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsBlog
+ */
+
+/** Actions *******************************************************************/
+
+/**
+ * Check if the user needs to set an avatar for his just registered blog.
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blogs_blog_maybe_redirect_to_single_blog() {
+        if ( ! is_multisite() || ! is_user_logged_in() || ! bp_blogs_blog_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_blog_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_blog_maybe_redirect_to_single_blog' );
+
+/**
+ * Make sure Signups are not forced to subscribe to root blog
+ *
+ * When a user is created, it first has a subscriber role, WordPress
+ * is then removing this role by deleting its capabilities. Unfortunately
+ * there's no hook before wp_create_user() in the wpmu_create_user() function
+ * so we need to remove the subscriptions as soon as we can.
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param  int $user_id the newly created ID of the user
+ */
+function bp_blogs_blog_remove_signup_subscription( $user_id = 0 ) {
+
+        // Delete the subscription
+        BP_Blogs_Blog::delete_blog_for_user( bp_get_root_blog_id(), $user_id );
+}
+add_action( 'wpmu_new_user', 'bp_blogs_blog_remove_signup_subscription', 10, 1 );
+
+/** Activity ******************************************************************/
+
+/**
+ * Register activity actions for the blog feature.
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blogs_blog_register_subscription_activity_action() {
+        /**
+         * Only add subscription actions if subscription are enabled
+         * for current blog, or when viewing the blogs activities on
+         * a user's profile or on the activity directory
+         */
+        if ( bp_blogs_blog_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_blog_format_activity_action_new_site_subscription',
+                        __( 'Site Subscriptions', 'buddypress' ),
+                        array( 'activity', 'member', 'blog', 'member_blogs' ),
+                        20
+                );
+        }
+}
+add_action( 'bp_blogs_register_activity_actions', 'bp_blogs_blog_register_subscription_activity_action' );
+
+ /**
+ * Activity action callback for new site subscriptions
+ *
+ * @since BuddyPress (2.4.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_blog_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() . '/' . bp_blogs_blog_get_site_slug() );
+        }
+
+        $action = sprintf(
+                __( '%1$s subscribed to the site %2$s', 'buddypress' ),
+                $user_link,
+                '<a href="' . esc_url( $view_details_link ) . '">' . esc_html( $blog_name ) . '</a>'
+        );
+
+        return apply_filters( 'bp_blogs_blog_format_activity_action_new_site_subscription', $action, $activity );
+}
+
+/**
+ * Set up activity arguments to use for the 'blogs' scope.
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param array $retval Empty array by default
+ * @param array $filter Current activity arguments
+ * @return array
+ */
+function bp_blogs_blog_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_blog_activity_scope', 10, 2 );
+
+/** Fonctions *****************************************************************/
+
+/**
+ * Get the root site's slug
+ *
+ * @since  BuddyPress (2.4.0)
+ *
+ * @param string $default The default slug for the root site
+ */
+function bp_blogs_blog_get_site_slug( $default = 'root' ) {
+        /**
+         * Filters the root site's slug.
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param string $default the default slug (root).
+         */
+        return sanitize_title( apply_filters( 'bp_blogs_blog_get_site_slug', $default ) );
+}
+
+/**
+ * Get a list of member ids for a given blog
+ *
+ * @since  BuddyPress (2.4.0)
+ *
+ * @param  array  $args {
+ *  $blog_id    int       the blog ID to get the members for
+ *  $user_level int|false false to get all members, 1 to restrict to contributors, 0 to only get subscribers
+ * }
+ * @return array      the list of member ids and extra data for the blog
+ */
+function bp_blogs_blog_get_users_for_blog( $args = array() ) {
+        $r = wp_parse_args( $args, array(
+                'blog_id'    => 0,
+                'user_level' => false,
+        ) );
+
+        if ( empty( $r['blog_id'] ) ) {
+                return false;
+        }
+
+        // Get the current blog to check if we already have the needed users
+        $current_blog = bp_blogs_blog_get_current_blog();
+
+        if ( ! empty( $current_blog->members ) && (int) $r['blog_id'] === (int) $current_blog->blog_id && false === $r['user_level'] ) {
+                return $current_blog->members;
+        } else {
+                return BP_Blogs_Blog::get_users_for_blog( $r['blog_id'], $r['user_level'] );
+        }
+}
+
+/**
+ * Get the total number of blogs for a specific user depending on his user level.
+ *
+ * @since  BuddyPress (2.4.0)
+ *
+ * @param  integer $user_id        the user id to get the number of blogs for
+ * @param  int     $is_contributor 1 to get the blogs count for the blogs he contributes to
+ *                                 0 to get the blogs count of the blogs he subscribed to
+ * @return int                     the blogs count
+ */
+function bp_blogs_total_blogs_for_user_level( $user_id = 0, $is_contributor = 0 ) {
+        if ( empty( $user_id ) ) {
+                if ( bp_is_user() ) {
+                        $user_id = bp_displayed_user_id();
+                } else {
+                        $user_id = bp_loggedin_user_id();
+                }
+        }
+
+        // no user ID or user level ? do not attempt to look at cache
+        if ( empty( $user_id ) || false === $is_contributor ) {
+                return 0;
+        }
+
+        $level = 'subscriber';
+        if ( 1 === (int) $is_contributor ) {
+                $level = 'contributor';
+        }
+
+        $count = wp_cache_get( 'bp_total_blogs_for_' . $level . '_' . $user_id, 'bp' );
+        if ( false === $count ) {
+                $count = BP_Blogs_Blog::total_blog_count_for_user( $user_id, $is_contributor );
+                wp_cache_set( 'bp_total_blogs_for_' . $level . '_' . $user_id, $count, 'bp' );
+        }
+
+        return $count;
+}
+
+/**
+ * Fetch a single blog object.
+ *
+ * @since  BuddyPress (2.4.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_blog_get_blog( $args = '' ) {
+        // Parse query arguments
+        $r = bp_parse_args( $args, array(
+                'blog_id'         => 0,
+                'populate_extras' => true // Whether to populate blogmeta
+        ), 'blogs_blog_get_blog' );
+
+        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( false, $r );
+
+        if ( $r['populate_extras'] && ! empty( $blog->blog_id ) ) {
+                wp_cache_set( $blog->blog_id, $blog, 'bp_blogs' );
+        }
+
+        /**
+         * Filters a single blog object.
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param BP_Blogs_Blog $blog Single blog object.
+         */
+        return apply_filters( 'bp_blogs_blog_get_blog', $blog );
+}
+
+/**
+ * Helper function to let you make sure the user is not added as a subscriber
+ * to the blog
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param  int $blog_id the blog id
+ * @return bool         True to add the subcriber role to the user.
+ *                      False otherwise
+ */
+function bp_blogs_blog_wp_subscriber_role( $blog_id = 0 ) {
+        if ( empty( $blog_id ) ) {
+                $blog_id = bp_blogs_blog_get_current_blog_id();
+        }
+
+        /**
+         * Use this filter if you do not want to add the user a subscriber role for the blog
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param bool True to add the subsriber role to the user for the blog,
+         *             False otherwise
+         * @param int  $blog_id the ID of the blog
+         */
+        return (bool) apply_filters( 'bp_blogs_blog_wp_subscriber_role', true, $blog_id );
+}
+
+/**
+ * Are subscriptions enabled for the given blog ?
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param  object $blog the Blogs single item object
+ * @return bool         true if subscription are enabled, false otherwise.
+ */
+function bp_blogs_blog_can_subscribe( $blog = null ) {
+        $can_subscribe = bp_blogs_blog_current_blog_can_subscribe();
+
+        if ( isset( $blog->disallow_subscriptions ) ) {
+                $can_subscribe = ! $blog->disallow_subscriptions;
+        }
+
+        /**
+         * Filters subscriptions setting for the blog
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param bool   $can_subscribe true if subscription are enabled, false otherwise.
+         * @param object $blog          Instance holding the current blog.
+         */
+        return (bool) apply_filters( 'bp_blogs_blog_can_subscribe', $can_subscribe, $blog );
+}
+
+/** Current blog **************************************************************/
+
+/**
+ * Get the BP_Blogs_Blog object corresponding to the current blog.
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @return BP_Blogs_Blog The current blog object.
+ */
+function bp_blogs_blog_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.4.0)
+         *
+         * @param BP_Blogs_Blog $current_blog Current BP_Blogs_Blog object.
+         */
+        return apply_filters( 'bp_blogs_blog_get_current_blog', $current_blog );
+}
+
+/**
+ * Returns the ID of the current blog
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @return string The ID of the current blog, if there is one
+ */
+function bp_blogs_blog_get_current_blog_id() {
+        $current_blog    = bp_blogs_blog_get_current_blog();
+        $current_blog_id = '';
+
+        if ( isset( $current_blog->blog_id ) ) {
+                $current_blog_id = $current_blog->blog_id;
+        }
+
+        /**
+         * Filters the ID of the current blog
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param string $current_blog_id ID of the current blog.
+         * @param object $current_blog    Instance holding the current blog.
+         */
+        return apply_filters( 'bp_blogs_blog_get_current_blog_id', $current_blog_id, $current_blog );
+}
+
+/**
+ * Returns the name of the current blog
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @return string The name of the current blog, if there is one
+ */
+function bp_blogs_blog_get_current_blog_name() {
+        $current_blog      = bp_blogs_blog_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.4.0)
+         *
+         * @param string $current_blog_name Name of the current blog.
+         * @param object $current_blog      Instance holding the current blog.
+         */
+        return apply_filters( 'bp_blogs_blog_get_current_blog_name', $current_blog_name, $current_blog );
+}
+
+/**
+ * Returns the slug of the current blog
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @return string The slug of the current blog, if there is one
+ */
+function bp_blogs_blog_get_current_blog_slug() {
+        $current_blog      = bp_blogs_blog_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.4.0)
+         *
+         * @param string $current_blog_slug Slug of the current blog.
+         * @param object $current_blog      Instance holding the current blog.
+         */
+        return apply_filters( 'bp_blogs_blog_get_current_blog_slug', $current_blog_slug, $current_blog );
+}
+
+/**
+ * Returns the admins of the current blog
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @return array The admins list of the current blog
+ */
+function bp_blogs_blog_get_current_blog_admins() {
+        $current_blog        = bp_blogs_blog_get_current_blog();
+        $current_blog_admins = array();
+
+        if ( isset( $current_blog->admins ) ) {
+                $current_blog_admins = wp_list_pluck( (array) $current_blog->admins, 'ID' );
+        }
+
+        /**
+         * Filters the slug of the current blog
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param array $current_blog_admins The admins list of the current blog
+         * @param object $current_blog       Instance holding the current blog.
+         */
+        return (array) apply_filters( 'bp_blogs_blog_get_current_blog_admins', $current_blog_admins, $current_blog );
+}
+
+/**
+ * Is the user able to access to single blog's content
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @return bool true if the user can access, false otherwise
+ */
+function bp_blogs_blog_current_blog_has_access() {
+        $current_blog    = bp_blogs_blog_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.4.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_blogs_blog_current_blog_has_access', $has_access, $current_blog );
+}
+
+/**
+ * Is the current blog item public
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @return bool true if the blog is public, false otherwise
+ */
+function bp_blogs_blog_current_blog_is_public() {
+        $current_blog    = bp_blogs_blog_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.4.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.4.0)
+ *
+ * @return bool true if users can subscribe to the current blog, false otherwise
+ */
+function bp_blogs_blog_current_blog_can_subscribe() {
+        $current_blog    = bp_blogs_blog_get_current_blog();
+
+        // Defaults to site's visibility
+        $can_subscribe   = bp_blogs_blog_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.4.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_blogs_blog_current_blog_can_subscribe', $can_subscribe, $current_blog );
+}
+
+/**
+ * Is current user a member of the current blog ?
+ *
+ * @since BuddyPress (2.4.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_blogs_blog_current_blog_is_member() {
+        $current_blog    = bp_blogs_blog_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.4.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_blogs_blog_current_blog_is_member', $is_member, $current_blog );
+}
+
+/**
+ * Return the link to the single blog item
+ *
+ * @since  BuddyPress (2.4.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_blogs_blog_get_view_details_link( $blog = null ) {
+        if ( empty( $blog->blog_id ) ) {
+                $blog = bp_blogs_blog_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 = bp_blogs_blog_get_site_slug();
+                } else {
+                        $slug = trim( str_replace( get_current_site()->path, '', $blog->path ), '/' );
+                }
+        } else {
+                return false;
+        }
+
+        $link = trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/' . $slug );
+
+        /**
+         * Filters the blog view details link.
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param string $link Permalink URL to the profile of the blog.
+         * @param object $blog the blogs single item object.
+         */
+        return apply_filters( 'bp_blogs_blog_get_view_details_link', $link, $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.4.0)
+ *
+ * @return bool true if the relationship was created, false otherwise
+ */
+function bp_blogs_blog_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( false, array( 'user_id' => $user_id, 'blog_id', $blog_id ) );
+
+        // The user has already subscribed or is a contributor
+        if ( ! empty( $join_blog->id ) ) {
+                return true;
+        }
+
+        // Create the association
+        $join_blog->user_id        = $user_id;
+        $join_blog->blog_id        = $blog_id;
+        $join_blog->is_contributor = 0;
+
+        if ( ! $join_blog->save() ) {
+                return false;
+        }
+
+        return true;
+}
+
+/**
+ * Subscribe a user to a blog
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param  int            $user_id the user id joining the blog
+ * @param  BP_Blogs_Blog  $blog the blog object
+ * @return array          the result in a feedback array
+ */
+function bp_blogs_blog_join_blog( $user_id = 0, $blog = null ) {
+        if ( empty( $blog ) ) {
+                $blog = bp_blogs_blog_get_current_blog();
+        }
+
+        // Default result
+        $result = array(
+                'message' => __( 'We were not able to perform this action, please try again later', 'buddypress' ),
+                'type'    => 'error',
+        );
+
+        if ( ! bp_blogs_blog_can_subscribe( $blog ) || empty( $blog->blog_id ) ) {
+                return $result;
+        }
+
+        // Init the WP subscription result
+        $subscribed = false;
+
+        if ( empty( $user_id ) ) {
+                $user_id = bp_loggedin_user_id();
+        }
+
+        // No user?
+        if ( empty( $user_id ) ) {
+                return $result;
+        }
+
+        /**
+         * Fires before the user joins the blog
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param int            $user_id the ID of the current user
+         * @param BP_Blogs_Blog  $blog the blog object
+         */
+        do_action( 'bp_blogs_blog_before_join_blog', $user_id, $blog );
+
+        // First WordPress, making sure not to add a user that is already a user of the blog
+        if ( bp_blogs_blog_wp_subscriber_role( $blog->blog_id ) && ! bp_user_can_for_blog( $user_id, 'read', $blog->blog_id ) ) {
+                // No need to use this action
+                remove_action( 'set_user_role', 'bp_blogs_add_user_to_blog', 10, 2 );
+
+                $subscribed = add_user_to_blog( $blog->blog_id, $user_id, 'subscriber' );
+
+                // Restore the action
+                add_action( 'set_user_role', 'bp_blogs_add_user_to_blog', 10, 2 );
+        }
+
+        if ( is_wp_error( $subscribed ) ) {
+                $result = array(
+                        'message' => $subscribed->get_error_message(),
+                        'type'    => 'error',
+                );
+        } else {
+                // Then BuddyPress
+                bp_blogs_blog_link_user_to_blog( $user_id, $blog->blog_id );
+
+                $result = array(
+                        'message' => __( 'You successfully joined the site.', 'buddypress' ),
+                        'type'    => '',
+                );
+
+                $user_link = bp_core_get_userlink( $user_id );
+
+                $action = sprintf(
+                        __( '%1$s subscribed to the site %2$s', 'buddypress' ),
+                        $user_link,
+                        '<a href="' . esc_url( bp_blogs_blog_get_view_details_link() ) . '">' . esc_html( $blog->name ) . '</a>'
+                );
+
+                bp_blogs_record_activity( array(
+                        'action'  => $action,
+                        'type'    => 'site_subscription',
+                        'item_id' => $blog->blog_id,
+                ) );
+
+                // Update the blog's last activity.
+                bp_blogs_update_blogmeta( $blog->blog_id, 'last_activity', bp_core_current_time() );
+
+                /**
+                 * Fires after the user joined the blog
+                 *
+                 * @since BuddyPress (2.4.0)
+                 *
+                 * @param int            $user_id the ID of the current user
+                 * @param BP_Blogs_Blog  $blog the current blog object
+                 */
+                do_action( 'bp_blogs_blog_joined_blog', $user_id, $blog );
+        }
+
+        return $result;
+}
+
+/**
+ * Unsubscribe a user from a blog
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param  int $user_id the user id joining the blog
+ * @param  int $blog_id the blog id the user is joining
+ * @return array        the result in a feedback array
+ */
+function bp_blogs_blog_leave_blog( $user_id = 0, $blog_id = 0 ) {
+        if ( empty( $blog_id ) ) {
+                $blog_id = bp_blogs_blog_get_current_blog_id();
+        }
+
+        // Default result
+        $result = array(
+                'message' => __( 'We were not able to perform this action, please try again later', 'buddypress' ),
+                'type'    => 'error',
+        );
+
+        // Bail if no blog were found
+        if ( empty( $blog_id ) ) {
+                return $result;
+        }
+
+        // Init the WP unsubscription result
+        $unsubscribed = false;
+
+        if ( empty( $user_id ) ) {
+                $user_id = bp_loggedin_user_id();
+        }
+
+        // No user?
+        if ( empty( $user_id ) ) {
+                return $result;
+        }
+
+        /**
+         * Fires before the user leaves the blog
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param int            $user_id the ID of the current user
+         * @param BP_Blogs_Blog  $blog the current blog object
+         */
+        do_action( 'bp_blogs_blog_before_leave_blog', $user_id, $blog_id );
+
+        // First WordPress
+        if ( bp_blogs_blog_wp_subscriber_role( $blog_id ) && bp_user_can_for_blog( $user_id, 'read', $blog_id ) ) {
+                // No need to use these actions
+                remove_action( 'remove_user_from_blog', 'bp_blogs_remove_blog_for_user', 10, 2 );
+                remove_action( 'remove_user_from_blog', 'bp_blogs_remove_user_from_blog', 10, 2 );
+
+                $unsubscribed = remove_user_from_blog( $user_id, $blog_id );
+
+                // Restore the actions
+                add_action( 'remove_user_from_blog', 'bp_blogs_remove_blog_for_user', 10, 2 );
+                add_action( 'remove_user_from_blog', 'bp_blogs_remove_user_from_blog', 10, 2 );
+        }
+
+        if ( is_wp_error( $unsubscribed ) ) {
+                $result = array(
+                        'message' => $unsubscribed->get_error_message(),
+                        'type'    => 'error',
+                );
+        } else {
+                // Then BuddyPress
+                BP_Blogs_Blog::delete_blog_for_user( $blog_id, $user_id );
+
+                $result = array(
+                        'message' => __( 'You successfully left 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 left the blog
+                 *
+                 * @since BuddyPress (2.4.0)
+                 *
+                 * @param int $user_id the ID of the current user
+                 * @param int $blog_id the ID of the blog
+                 */
+                do_action( 'bp_blogs_blog_left_blog', $user_id, $blog_id );
+        }
+
+        return $result;
+}
+
+/**
+ * Generate the avatar upload directory path for a given blog.
+ *
+ * @since BuddyPress (2.4.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_blogs_blog_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.4.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.4.0)
+ *
+ * @return bool true if avatar uploads are enabled, false otherwise.
+ */
+function bp_blogs_blog_is_avatar_uploads_enabled() {
+        $bp = buddypress();
+
+        /**
+         * Check if :
+         * - user can upload blog avatars
+         * - the WordPress show avatars setting is enabled
+         * - the new avatar UI is not disabled.
+         */
+        $is_avatar_enabled = ! bp_blogs_blog_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.4.0)
+         *
+         * @param bool $is_avatar_enabled true if avatar uploads are enabled, false otherwise.
+         */
+        return (bool) apply_filters( 'bp_blogs_blog_is_avatar_uploads_enabled', $is_avatar_enabled );
+}
+
+/**
+ * Return whether a blog has an avatar
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param  int $blog_id
+ * @return boolean
+ */
+function bp_get_blog_has_avatar( $blog_id = false ) {
+        if ( false === $blog_id ) {
+                $blog_id = bp_blogs_blog_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;
+}
+
+/** Filters ******************************************************************/
+
+/**
+ * Filters the body class to add a custom header class if the
+ * current blog is supporting it
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param  array $classes list of body classes
+ * @return array the list of body classes
+ */
+function bp_blogs_blog_body_class( $classes = array() ) {
+        // Get the current blog
+        $current_blog = bp_blogs_blog_get_current_blog();
+
+        // If set, check it has a custom header
+        if ( ! empty( $current_blog->custom_header ) ) {
+                $classes[] = 'bp-blog-custom-header';
+        }
+
+        return $classes;
+}
+add_filter( 'bp_get_the_body_class', 'bp_blogs_blog_body_class', 10, 1 );
+
+add_filter( 'bp_get_blog_description',          'wptexturize'       );
+add_filter( 'bp_get_blog_name',                 'wptexturize'       );
+add_filter( 'bp_get_blog_description',          'convert_smilies'   );
+add_filter( 'bp_get_blog_description',          'convert_chars'     );
+add_filter( 'bp_get_blog_name',                 'convert_chars'     );
+add_filter( 'bp_get_blog_description',          'wpautop'           );
+add_filter( 'bp_get_blog_description',          'make_clickable', 9 );
+add_filter( 'bp_get_blog_name',                 'wp_filter_kses', 1 );
+add_filter( 'bp_get_blog_description',          'stripslashes'      );
+add_filter( 'bp_get_blog_description_editable', 'stripslashes'      );
+add_filter( 'bp_get_blog_name',                 'stripslashes'      );
+add_filter( 'bp_get_blog_name_editable',        'stripslashes'      );
+
+/** Screens ******************************************************************/
+
+/**
+ * Home screen for the blogs single item
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blogs_blog_screen_blog_home() {
+        if ( ! bp_is_single_item() ) {
+                return false;
+        }
+
+        /**
+         * Hook here to run specific actions juste before
+         * a blog's single page is displayed
+         *
+         * @since BuddyPress (2.4.0)
+         */
+        do_action( 'bp_blogs_blog_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', 'buddypress' ),
+                        'type'    => 'error',
+                );
+
+                if ( is_user_logged_in() && is_callable( 'bp_blogs_blog_' . $action . '_blog' ) ) {
+                        $result = call_user_func( 'bp_blogs_blog_' . $action . '_blog' );
+                }
+
+                bp_core_add_message( $result['message'], $result['type'] );
+                bp_core_redirect( $referer );
+        }
+
+        bp_core_load_template( apply_filters( 'bp_blogs_blog_template_blog_home', 'blogs/single/home' ) );
+}
+
+/**
+ * Settings screen for the blogs single item
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blogs_blog_screen_blog_settings() {
+        if ( ! bp_is_single_item() ) {
+                return false;
+        }
+
+        /**
+         * Hook here to run specific actions juste before
+         * a blog's single settings page is displayed
+         *
+         * @since BuddyPress (2.4.0)
+         */
+        do_action( 'bp_blogs_blog_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_blogs_blog_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&#39;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_subscriber'] ) ) {
+
+                check_admin_referer( 'blogs_remove_subscriber' );
+
+                $blog_id = bp_blogs_blog_get_current_blog_id();
+                $user_id = intval( $_GET['remove_subscriber'] );
+                $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 );
+                }
+
+                if ( bp_user_can_for_blog( $user_id, 'edit_posts', $blog_id ) ) {
+                        $message = __( 'Only subscriptions can be removed from this screen.', 'buddypress' );
+                        bp_core_add_message( $message, $type );
+                        bp_core_redirect( $referer );
+                }
+
+                /**
+                 * Fires before the user is removed from the blog
+                 *
+                 * @since BuddyPress (2.4.0)
+                 *
+                 * @param int $user_id the ID of the current user
+                 * @param int $blog_id the ID of the blog
+                 */
+                do_action( 'bp_blogs_blog_before_remove_user_from_blog', $user_id, $blog_id );
+
+                /**
+                 * Removing the user is the same than leaving the blog
+                 */
+                $removed = bp_blogs_blog_leave_blog( $user_id, $blog_id );
+
+                if ( isset( $removed['type'] ) && 'error' !== $removed['type'] ) {
+                        $message = __( 'Member successfully removed from the site.', 'buddypress' );
+                        $type    = 'success';
+
+                        /**
+                         * Fires after the user was removed from the blog
+                         *
+                         * @since BuddyPress (2.4.0)
+                         *
+                         * @param int $user_id the ID of the current user
+                         * @param int $blog_id the ID of the blog
+                         */
+                        do_action( 'bp_blogs_blog_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_blog_template_blog_settings', 'blogs/single/home' ) );
+}
+
+/** Template *****************************************************************/
+
+// Blogs Directory
+
+/**
+ * Output button to view the blogs single item details.
+ *
+ * @since BuddyPress (2.4.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.4.0)
+         *
+         * @see BP_Button for a complete description of arguments and return
+         *      value.
+         *
+         * @global object $blogs_template {@link BP_Blogs_Template}
+         *
+         * @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 = '' ) {
+                global $blogs_template;
+                $blog = false;
+
+                if ( ! empty( $blogs_template->blog ) ) {
+                        $blog = $blogs_template->blog;
+                } else {
+                        $blog = bp_get_blog();
+                }
+
+                $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_blogs_blog_get_view_details_link( $blog ) ),
+                        '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 ) );
+        }
+
+// Blogs Single item
+
+/**
+ * Load the appropriate current blog's home page
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blogs_blog_load_front_template( $require_once = false, $blog = null ) {
+        $located = bp_blogs_blog_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_blogs_blog_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.4.0)
+ */
+function bp_blogs_blog_get_blog_front_template( $blog = null ) {
+        if ( ! is_a( $blog, 'BP_Blogs_Blog' ) ) {
+                $blog = bp_blogs_blog_get_current_blog();
+        }
+
+        if ( ! isset( $blog->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->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 );
+}
+
+/**
+ * Get the blog object within the blogs loop
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @global $blogs_template
+ */
+function bp_get_blog() {
+        global $blogs_template;
+        $blog = false;
+
+        if ( ! empty( $blogs_template->blog->blog_id ) ) {
+                $blog = &$blogs_template->blog;
+        } else {
+                $blog = bp_blogs_blog_get_current_blog();
+        }
+
+        return apply_filters( 'bp_get_blog', $blog );
+}
+
+// Add a button to visit the site in the blogs single item
+add_action( 'bp_blog_header_actions', 'bp_blogs_visit_blog_button', 10 );
+
+/**
+ * Display the blog's custom header if set
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_custom_header() {
+        echo bp_get_blog_custom_header();
+}
+
+        /**
+         * Get the blog's custom header if set
+         *
+         * NB: The custom header is managed by the blog's
+         * active theme.
+         *
+         * @since BuddyPress (2.4.0)
+         */
+        function bp_get_blog_custom_header() {
+                $blog          = bp_get_blog();
+                $custom_header = false;
+
+                if ( ! empty( $blog->custom_header ) ) {
+                        $custom_header = $blog->custom_header;
+                }
+
+                if ( ! (bool) $custom_header ) {
+                        return;
+                }
+
+                $output = array(
+                        '<style type="text/css" media="screen">',
+                        '/*<![CDATA[*/',
+                        '#buddypress #item-header {',
+                        '   background: url(' . $custom_header . ') no-repeat 50% 50%;',
+                        '}',
+                        '/*]]>*/',
+                        '</style>',
+                );
+
+                /**
+                 * Filters a blog's custom header.
+                 *
+                 * @since BuddyPress (2.4.0)
+                 *
+                 * @param string         some css rules
+                 * @param array  $output The output organized into an array
+                 * @param object $blog   The blog object
+                 */
+                return apply_filters( 'bp_get_blog_custom_header', join( "\n", $output ), $output, $blog );
+        }
+
+/**
+ * Display the admins in the blog's header
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_list_admins() {
+        echo bp_get_blog_list_admins();
+}
+        /**
+         * Get the admins list
+         *
+         * @since BuddyPress (2.4.0)
+         */
+        function bp_get_blog_list_admins() {
+                $blog       = bp_get_blog();
+                $pre_output = false;
+
+                // Do not display admins if the user has no access
+                if ( ! bp_blog_has_access() ) {
+                        $pre_output = '';
+                }
+
+                /**
+                 * Use this filter if you need to hide the blog admins by returning false
+                 *
+                 * @since BuddyPress (2.4.0)
+                 *
+                 * @param boolean $pre_output whether to output the list of the current blog admins
+                 * @param object  $blog the blogs single item object
+                 */
+                $pre_output = apply_filters( 'bp_blog_pre_get_current_blog_admins', $pre_output, $blog );
+                if ( false !== $pre_output ) {
+                        return $pre_output;
+                }
+
+                $output = '<h3>' . esc_html__( 'Site Admins', 'buddypress' ) . '</h3>';
+
+                if ( ! empty( $blog->admins ) ) {
+                        $output .= '<ul id="blog-admins">';
+
+                        foreach( (array) $blog->admins as $admin ) {
+                                $output .= '<li>';
+
+                                if ( bp_disable_avatar_uploads() ) {
+                                        $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', 'buddypress' ), $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', 'buddypress' ), $admin->display_name )
+                                                ) )
+                                        );
+                                }
+
+                                $output .= '</li>';
+                        }
+
+                        $output .= '</ul>';
+                } else {
+                        $output .= '<span class="activity">' . esc_html__( 'No Admins', 'buddypress' ) . '</span>';
+                }
+
+                return apply_filters( 'bp_get_blog_list_admins', $output, $blog );
+        }
+
+/**
+ * Output the link to the single blog item
+ *
+ * @since  BuddyPress (2.4.0)
+ */
+function bp_blog_view_details_link() {
+        echo bp_blogs_blog_get_view_details_link( bp_get_blog() );
+}
+
+/**
+ * Is the current blog item public
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @return bool true if the blog is public, false otherwise
+ */
+function bp_blog_is_public() {
+        $blog      = bp_get_blog();
+        $is_public = false;
+
+        if ( ! empty( $blog->blog_public ) ) {
+                $is_public = $blog->blog_public;
+        }
+
+        /**
+         * Filters activity visibility of the blog
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param bool   $is_public    true if blog is public, false otherwise.
+         * @param object $blog         the blogs single object.
+         */
+        return (bool) apply_filters( 'bp_is_blog_public', $is_public, $blog );
+}
+
+/**
+ * Display the current blog type
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_status() {
+        echo bp_get_blog_status();
+}
+
+        /**
+         * Display the blog status
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @return string The status of the blog, if there is one
+         */
+        function bp_get_blog_status() {
+                $status = esc_html__( 'Private', 'buddypress' );
+
+                if ( bp_blog_is_public() ) {
+                        $status = esc_html__( 'Public', 'buddypress' );
+                }
+
+                /**
+                 * Use this filter if you need to edit the blog status
+                 *
+                 * @since BuddyPress (2.4.0)
+                 *
+                 * @param string $status the blog status
+                 */
+                return apply_filters( 'bp_get_blog_status', $status );
+        }
+
+/**
+ * Is the blog supporting subscriptions
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @return bool True if users can subscribe, false otherwise
+ */
+function bp_get_blog_can_subscribe() {
+        return bp_blogs_blog_can_subscribe( bp_get_blog() );
+}
+
+/**
+ * Is the current user a member of the blog ?
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @return bool True if users is a member of the blog, false otherwise
+ */
+function bp_blog_is_member() {
+        $blog      = bp_get_blog();
+        $is_member = false;
+
+        if ( ! empty( $blog->is_member ) ) {
+                $is_member = $blog->is_member;
+        }
+
+        /**
+         * Filters the current user's membership
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param bool   $is_member true if the current user is a member of the blog, false otherwise.
+         * @param object $blog      the blogs single object.
+         */
+        return (bool) apply_filters( 'bp_blog_is_member', $is_member, $blog );
+}
+
+function bp_blog_is_contributor() {
+        $blog           = bp_get_blog();
+        $is_contributor = false;
+
+        if ( ! empty( $blog->is_contributor ) ) {
+                $is_contributor = $blog->is_contributor;
+        }
+
+        /**
+         * Filters the current user's contributor's level for the blog
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param bool   $is_contributor true if the current user is a contributor of the blog, false otherwise.
+         * @param object $blog           the blogs single object.
+         */
+        return (bool) apply_filters( 'bp_blog_is_contributor', $is_contributor, $blog );
+}
+
+/**
+ * Does the user has access to the blog ?
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_has_access() {
+        $blog       = bp_get_blog();
+        $has_access = false;
+
+        if ( ! empty( $blog->user_has_access ) ) {
+                $has_access = $blog->user_has_access;
+        }
+
+        /**
+         * Filters user's access for the blog
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param bool   $has_access   true if user has access, false otherwise.
+         * @param object $blog         the blogs single object.
+         */
+        return (bool) apply_filters( 'bp_blog_has_access', $has_access, $blog );
+}
+
+/**
+ * Prints a message if the user has no access to the blog's content
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_status_message() {
+        $blog = bp_get_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.4.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 );
+}
+
+/**
+ * Add a subcribe button in blog's header
+ *
+ * @since BuddyPress (2.4.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.4.0)
+         */
+        function bp_get_blogs_join_blog_button( $blog = null ) {
+                if ( empty( $blog ) ) {
+                        $blog = bp_get_blog();
+                }
+
+                if ( ! is_user_logged_in() || ! isset( $blog->blog_id ) || ! bp_get_blog_can_subscribe() ) {
+                        return false;
+                }
+
+                // Already a member
+                if ( bp_blog_is_member() ) {
+
+                        if ( bp_blog_is_contributor() ) {
+                                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->blog_id,
+                                'link_href'         => esc_url( wp_nonce_url( bp_blogs_blog_get_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->blog_id,
+                                'link_href'         => esc_url( wp_nonce_url( bp_blogs_blog_get_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 ) );
+        }
+
+// Blogs single item Members
+
+/**
+ * Construct a specific query for blog members
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param  BP_User_Query &$blog_user_query the BuddyPress User query object passed by reference
+ */
+function bp_blogs_blog_set_user_query( &$blog_user_query = null ) {
+        $bp = buddypress();
+
+        if ( empty( $bp->blogs->blog_user_query->args ) ) {
+                return;
+        }
+
+        $bp->blogs->blog_user_query->results = bp_blogs_blog_get_users_for_blog( $bp->blogs->blog_user_query->args );
+
+        // Defaults to no members by forcing to include a null user
+        $blog_members = array( 0 );
+
+        if ( ! empty( $bp->blogs->blog_user_query->results ) ) {
+                $blog_members = wp_list_pluck( $bp->blogs->blog_user_query->results, 'user_id' );
+        }
+
+        // Only include blog members ids
+        $blog_user_query->query_vars_raw['include'] = $blog_members;
+        $blog_user_query->query_vars['include']     = wp_parse_id_list( $blog_members );
+}
+
+/**
+ * Populate extra datas for each user of the blog members loop
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param  BP_User_Query $blog_user_query the BuddyPress User query object
+ */
+function bp_blogs_blog_user_query_populate_extras( $blog_user_query = null ) {
+        $bp = buddypress();
+
+        if ( empty( $bp->blogs->blog_user_query->results ) ) {
+                return;
+        }
+
+        $blog_admins = (array) bp_blogs_blog_get_current_blog_admins();
+
+        foreach ( (array) $bp->blogs->blog_user_query->results as $extra ) {
+                if ( isset( $blog_user_query->results[ $extra->user_id ] ) ) {
+                        $blog_user_query->results[ $extra->user_id ]->is_contributor = (int) $extra->is_contributor;
+
+                        if ( ! empty( $blog_admins ) && in_array( $extra->user_id, $blog_admins ) ) {
+                                $blog_user_query->results[ $extra->user_id ]->is_admin = 1;
+                        } else {
+                                $blog_user_query->results[ $extra->user_id ]->is_admin = 0;
+                        }
+                }
+        }
+}
+
+/**
+ * bp_has_members wrapper to fetch the current blog's members
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @see bp_has_members() for detailed available arguments
+ */
+function bp_blog_has_members( $args = '' ) {
+        $bp = buddypress();
+
+        $user_level = false;
+
+        /**
+         * Only manage subscriptions when on the manage subscribers screen
+         */
+        if ( bp_is_blog_manage_screen( 'members' ) ) {
+                $user_level = 0;
+        }
+
+        $r = bp_parse_args( $args, array(
+                'type'            => 'active',
+                'page'            => 1,
+                'per_page'        => 20,
+                'max'             => false,
+                'page_arg'        => 'blogpage',
+                'user_id'         => 0,
+                'blog_id'         => bp_blogs_blog_get_current_blog_id(),          // Only return users of the current blog
+                'user_level'      => $user_level,
+        ), 'blog_has_members' );
+
+        // Build specific arguments for the Blog members
+        $bp->blogs->blog_user_query = new stdClass();
+        $bp->blogs->blog_user_query->args = array( 'blog_id' => (int) $r['blog_id'], 'user_level' => $r['user_level'] );
+
+        // Map levels
+        if ( 'contributor' === $r['user_level'] ) {
+                $bp->blogs->blog_user_query->args['user_level'] = 1;
+        } elseif ( 'subscriber' === $r['user_level'] ) {
+                $bp->blogs->blog_user_query->args['user_level'] = 0;
+        }
+
+        // Set up our query construct hook
+        add_action( 'bp_pre_user_query_construct', 'bp_blogs_blog_set_user_query', 10, 1 );
+
+        // Set up our populate_extras hook
+        add_action( 'bp_user_query_populate_extras', 'bp_blogs_blog_user_query_populate_extras', 10, 1 );
+
+        $blog_members = bp_has_members( $r );
+
+        // Remove actions
+        remove_action( 'bp_pre_user_query_construct', 'bp_blogs_blog_set_user_query', 10, 1 );
+        remove_action( 'bp_user_query_populate_extras', 'bp_blogs_blog_user_query_populate_extras', 10, 1 );
+
+        // Unset the global
+        unset( $bp->blogs->blog_user_query );
+
+        return $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_members wrapper for the current blog's
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_members() {
+        return bp_members();
+}
+
+/**
+ * bp_the_member wrapper for the current blog's
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_the_member() {
+        return bp_the_member();
+}
+
+/**
+ * bp_member_permalink wrapper for the current blog's
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_member_permalink() {
+        return bp_member_permalink();
+}
+
+/**
+ * bp_member_avatar wrapper for the current blog's
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_member_avatar() {
+        return bp_member_avatar();
+}
+
+/**
+ * bp_member_name wrapper for the current blog's
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_member_name() {
+        return bp_member_name();
+}
+
+/**
+ * bp_get_member_latest_update wrapper for the current blog's
+ *
+ * @since BuddyPress (2.4.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.4.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.4.0)
+ */
+function bp_blog_member_last_active() {
+        return bp_member_last_active();
+}
+
+/**
+ * Output button to remove a member from the site.
+ *
+ * @since BuddyPress (2.4.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.4.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_subscriber'.
+         *     @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 = '' ) {
+                global $members_template;
+
+                $remove_link = trailingslashit( bp_blogs_blog_get_view_details_link() . 'manage/members' );
+
+                /**
+                 * Extra security to avoid a contributor to be removed from the subscribers management screen
+                 *
+                 * Only subscribers should be listed on this screen @see bp_blog_has_members()
+                 */
+                if ( isset( $members_template->member->is_contributor ) && 1 === (int) $members_template->member->is_contributor ) {
+                        return;
+                }
+
+                $button = wp_parse_args( $args, array(
+                        'id'                => 'blog_remove_subscriber',
+                        '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_subscriber=' . bp_get_member_user_id(), 'blogs_remove_subscriber' ) ),
+                        '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 ) );
+        }
+
+// Blogs single item settings
+
+/**
+ * Display the blog's editable name
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_name_editable() {
+        echo bp_get_blog_name_editable();
+}
+
+        /**
+         * Get the blog's editable name
+         *
+         * 'bp_get_blog_name_editable' does not have the formatting
+         * filters that 'bp_get_blog_name' has, which makes it
+         * appropriate for "raw" editing.
+         *
+         * @since BuddyPress (2.4.0)
+         */
+        function bp_get_blog_name_editable() {
+                $blog      = bp_get_blog();
+                $blog_name = false;
+
+                if ( ! empty( $blog->name ) ) {
+                        $blog_name = $blog->name;
+                }
+
+                /**
+                 * Filters the editable blog name.
+                 *
+                 * @since BuddyPress (2.4.0)
+                 *
+                 * @param string $blog_name the name of the blog.
+                 * @param object $blog      Blog to get the editable name for.
+                 */
+                return apply_filters( 'bp_get_blog_name_editable', $blog_name, $blog );
+        }
+
+/**
+ * Display the editable blog's description
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_blog_description_editable() {
+        echo bp_get_blog_description_editable();
+}
+
+        /**
+         * Get the blog's editable description
+         *
+         * 'bp_get_blog_description_editable' does not have the formatting
+         * filters that 'bp_get_blog_description' has, which makes it
+         * appropriate for "raw" editing.
+         *
+         * @since BuddyPress (2.4.0)
+         */
+        function bp_get_blog_description_editable() {
+                $blog             = bp_get_blog();
+                $blog_description = false;
+
+                if ( ! empty( $blog->description ) ) {
+                        $blog_description = $blog->description;
+                }
+
+                /**
+                 * Filters the editable blog description.
+                 *
+                 * @since BuddyPress (2.4.0)
+                 *
+                 * @param string $blog_description the description of the blog.
+                 * @param object $blog             Blog to get the editable description for.
+                 */
+                return apply_filters( 'bp_get_blog_description_editable', $blog_description, $blog );
+        }

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

@@ -46 +46 @@
         if ( ! empty( $user_id ) ) {
                 wp_cache_delete( 'bp_blogs_of_user_'        . $user_id, 'bp' );
                 wp_cache_delete( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
+
+                if ( is_multisite() && bp_is_active( 'blogs', 'blog' ) ) {
+                        wp_cache_delete( 'bp_total_blogs_for_contributor_' . $user_id, 'bp' );
+                        wp_cache_delete( 'bp_total_blogs_for_subscriber_' . $user_id,  'bp' );
+                }
         }
 
         wp_cache_delete( 'bp_total_blogs', 'bp' );
@@ -56 +61 @@
 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.4.0)
+ *
+ * @param int $blog_id The blog being edited.
+ */
+function bp_blogs_delete_blog_cache( $blog_id = 0 ) {
+        if ( is_multisite() && bp_is_active( 'blogs', 'blog' ) ) {
+                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.4.0)
+ *
+ * @param int $user_id ID of the user whose blog cache should be cleared.
+ */
+function bp_blogs_delete_blogs_cache( $user_id = 0 ) {
+        if ( is_multisite() && bp_is_active( 'blogs', 'blog' ) ) {
+                $blogs = BP_Blogs_Blog::get_blog_ids_for_user( $user_id );
+
+                if ( empty( $blogs ) ) {
+                        return;
+                }
+
+                foreach ( $blogs as $blog_id ) {
+                        wp_cache_delete( $blog_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.4.0)
+ *
+ * @param int $blog_id The blog being edited.
+ */
+function bp_blogs_delete_blog_cache_on_change() {
+        if ( is_multisite() && bp_is_active( 'blogs', 'blog' ) ) {
+                $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' );
+
+/**
+ * Bust blog caches when a user joins or leaves a blog
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param int $user_id ID of the user whose blog cache should be cleared.
+ * @param BP_Blogs_Blog|int $blog The blog being joined or left.
+ */
+function bp_blogs_delete_blog_cache_on_joinleave( $user_id, $blog ) {
+        if ( is_multisite() && bp_is_active( 'blogs', 'blog' ) ) {
+                if ( is_a( $blog, 'BP_Blogs_Blog' ) ) {
+                        $blog_id = (int) $blog->blog_id;
+                } else {
+                        $blog_id = (int) $blog;
+                }
+
+                wp_cache_delete( $blog_id, 'bp_blogs' );
+
+                // Totals
+                wp_cache_delete( 'bp_total_blogs_for_user_' . $user_id,        'bp' );
+                wp_cache_delete( 'bp_total_blogs_for_contributor_' . $user_id, 'bp' );
+                wp_cache_delete( 'bp_total_blogs_for_subscriber_' . $user_id,  'bp' );
+        }
+}
+add_action( 'bp_blogs_blog_left_blog',   'bp_blogs_delete_blog_cache_on_joinleave', 10, 2 );
+add_action( 'bp_blogs_blog_joined_blog', 'bp_blogs_delete_blog_cache_on_joinleave', 10, 2 );
+
 // 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

@@ -47 +47 @@
                 'type'              => 'active', // 'active', 'alphabetical', 'newest', or 'random'
                 'include_blog_ids'  => false,    // Array of blog IDs to include
                 'user_id'           => false,    // Limit to blogs this user can post to
+                'user_level'        => false,    // 1 to limit to blogs the user is a contributor of
+                                         // 0 to limit to blogs the user is a subscriber of
                 'search_terms'      => false,    // Limit to blogs matching these search terms
                 'per_page'          => 20,       // The number of results to return per page
                 'page'              => 1,        // The page to return if limiting per page
@@ -59 +61 @@
                 $r['per_page'],
                 $r['page'],
                 $r['user_id'],
+                $r['user_level'],
                 $r['search_terms'],
                 $r['update_meta_cache'],
                 $r['include_blog_ids']
@@ -77 +80 @@
  * @uses get_users()
  * @uses bp_blogs_record_blog()
  */
-function bp_blogs_record_existing_blogs() {
+function bp_blogs_record_existing_blogs( $reset = false ) {
         global $wpdb;
 
         // Query for all sites in network
@@ -110 +113 @@
         // Get BuddyPress
         $bp = buddypress();
 
-        // Truncate user blogs table
-        $truncate = $wpdb->query( "TRUNCATE {$bp->blogs->table_name}" );
-        if ( is_wp_error( $truncate ) ) {
-                return false;
+        /**
+         * Only Truncate user blogs table if the admin wants
+         * to completely reset the users/blogs association.
+         * This will remove all subscriptions.
+         */
+        if ( ! empty( $reset ) ) {
+                $truncate = $wpdb->query( "TRUNCATE {$bp->blogs->table_name}" );
+                if ( is_wp_error( $truncate ) ) {
+                        return false;
+                }
         }
 
         // Truncate user blogsmeta table
@@ -140 +149 @@
 
                 // Loop through users and record their relationship to this blog
                 foreach ( (array) $users as $user ) {
-                        bp_blogs_add_user_to_blog( $user->ID, false, $blog_id );
+                        // Using true as 4th argument informs it's a batch process
+                        bp_blogs_add_user_to_blog( $user->ID, false, $blog_id, true );
                 }
         }
 
@@ -252 +262 @@
                 $thread_depth = 1;
         }
 
-        $recorded_blog          = new BP_Blogs_Blog;
-        $recorded_blog->user_id = $user_id;
-        $recorded_blog->blog_id = $blog_id;
-        $recorded_blog_id       = $recorded_blog->save();
-        $is_recorded            = !empty( $recorded_blog_id ) ? true : false;
+        // Check if the association already exists
+        $recorded_blog = new BP_Blogs_Blog( false, array( 'user_id' => $user_id, 'blog_id' => $blog_id ) );
+
+        // No blog found, it's a new association
+        if ( empty( $recorded_blog->id ) ) {
+                $recorded_blog->user_id        = $user_id;
+                $recorded_blog->blog_id        = $blog_id;
+        }
+
+        // Used to separate subscribers from contributors
+        if ( bp_user_can_for_blog( $user_id, 'edit_posts', $blog_id ) ) {
+                $recorded_blog->is_contributor = 1;
+        } else {
+                $recorded_blog->is_contributor = 0;
+        }
+
+        // Save or update the user/blog association
+        $recorded_blog_id = $recorded_blog->save();
+        $is_recorded = false;
+
+        if ( ! empty( $recorded_blog_id ) ) {
+                $is_recorded = true;
+        }
 
         bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'url', $url );
         bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'name', $name );
@@ -732 +760 @@
  * @param int         $user_id The ID of the user
  * @param string|bool $role    User's WordPress role for this blog ID
  * @param int         $blog_id Blog ID user is being added to
+ * @param bool        $batch True if it's a batch operation (initial population/restore), false otherwise
  *
  * @return bool|null False on failure.
  */
-function bp_blogs_add_user_to_blog( $user_id, $role = false, $blog_id = 0 ) {
+function bp_blogs_add_user_to_blog( $user_id, $role = false, $blog_id = 0, $batch = false ) {
         global $wpdb;
 
         // If no blog ID was passed, use the root blog ID
@@ -769 +798 @@
                 }
         }
 
-        // Bail if no role was found or role is not in the allowed roles array
-        if ( empty( $role ) || ! in_array( $role, bp_blogs_get_allowed_roles() ) ) {
+        // Bail if no role was found
+        if ( empty( $role ) ) {
+                /**
+                 * If it's not a batch operation and the user has no role on the site
+                 * remove the user blog association without deleting the 'new_blog'
+                 * activity
+                 */
+                if ( empty( $batch ) ) {
+                        // Also remove the new subscription activity
+                        if ( bp_is_active( 'blogs', 'blog' ) ) {
+                                bp_blogs_blog_leave_blog( $user_id, $blog_id );
+
+                        // Simply remove the user blog association and make sure to reset blogs total cache
+                        } else {
+                                BP_Blogs_Blog::delete_blog_for_user( $blog_id, $user_id );
+
+                                /**
+                                 * Fires after a blog has been removed from the tracker for a specific user.
+                                 *
+                                 * @since BuddyPress (1.0.0)
+                                 *
+                                 * @param int $blog_id ID of the blog that was removed.
+                                 * @param int $user_id ID of the user having the blog removed for.
+                                 */
+                                do_action( 'bp_blogs_remove_blog_for_user', $blog_id, $user_id );
+                        }
+                }
+
+                return false;
+        }
+
+        // Bail if it's a batch operation and role is not in the allowed roles array
+        if ( ! empty( $batch ) && ! in_array( $role, bp_blogs_get_allowed_roles() ) ) {
                 return false;
         }
 
         // Record the blog activity for this user being added to this blog
         bp_blogs_record_blog( $blog_id, $user_id, true );
 }
-add_action( 'add_user_to_blog', 'bp_blogs_add_user_to_blog', 10, 3 );
-add_action( 'profile_update',   'bp_blogs_add_user_to_blog'        );
-add_action( 'user_register',    'bp_blogs_add_user_to_blog'        );
+add_action( 'set_user_role', 'bp_blogs_add_user_to_blog', 10, 2 );
 
 /**
  * The allowed blog roles a member must have to be recorded into the
@@ -861 +919 @@
                 'type'      => 'new_blog'
         ) );
 
+        // Remove the site's avatar.
+        if ( is_multisite() && bp_blogs_blog_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.
@@ -1195 +1258 @@
                 return 0;
         }
 
-        $count = wp_cache_get( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
-        if ( false === $count ) {
-                $count = BP_Blogs_Blog::total_blog_count_for_user( $user_id );
-                wp_cache_set( 'bp_total_blogs_for_user_' . $user_id, $count, 'bp' );
+        if ( bp_is_active( 'blogs', 'blog' ) && bp_is_blogs_directory() ) {
+                // User level: 1 = contributor, 0 = subscriber
+                return bp_blogs_total_blogs_for_user_level( $user_id, 1 );
+        } else {
+                $count = wp_cache_get( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
+                if ( false === $count ) {
+                        $count = BP_Blogs_Blog::total_blog_count_for_user( $user_id, false );
+                        wp_cache_set( 'bp_total_blogs_for_user_' . $user_id, $count, 'bp' );
+                }
         }
 
         return $count;
@@ -1466 +1534 @@
         $blogs = array_keys( $user_blogs );
 
         foreach ( $blogs as $blog_id ) {
-                bp_blogs_add_user_to_blog( $user_id, false, $blog_id );
+                bp_blogs_add_user_to_blog( $user_id, false, $blog_id, true );
         }
 }
 add_action( 'bp_make_ham_user', 'bp_blogs_restore_data', 10, 1 );

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

@@ -16 +16 @@
 
 class BP_Blogs_Component extends BP_Component {
 
+        public $nav = null;
+
         /**
          * Start the blogs component creation process.
          *
@@ -27 +29 @@
                         __( 'Site Directory', 'buddypress' ),
                         buddypress()->plugin_dir,
                         array(
-                                'adminbar_myaccount_order' => 30
+                                'adminbar_myaccount_order' => 30,
+                                'features'                 => array( 'blog' ),
                         )
                 );
         }
@@ -101 +104 @@
 
                 // 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_is_active( $this->id, 'blog' ) ) {
+                        /**
+                         * Set the blogs single nav
+                         *
+                         * We need to do this early so that we can manage item access
+                         * within the single nav
+                         */
+                        $this->nav = new BP_Single_Item_Navigation( array(
+                                'component_id'   => $this->id,
+                                'component_slug' => bp_get_blogs_root_slug(),
+                                'single_item'    => 'blog',
+                        ) );
+
+                        // Sort the single item nav
+                        add_action( 'wp_head', array( $this, 'sort_single_item_nav' ) );
+
+                        // Find the current blog id
+                        if ( bp_is_current_action( bp_blogs_blog_get_site_slug() ) ) {
+                                $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_blog_get_blog( array( 'blog_id' => $blog_id ) );
+
+                        if ( empty( $this->current_blog->blog_id ) ) {
+                                $this->current_blog = 0;
+                                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 );
+
+                        $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 );
+                        }
+
+                        // 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 && ! bp_is_item_admin() ) {
+                                $this->current_blog->user_has_access = false;
+                        }
+
+                        // Check once if the current blog has a custom front template
+                        $this->current_blog->front_template = bp_blogs_blog_get_blog_front_template( $this->current_blog );
+                }
         }
 
         /**
+         * Set up canonical stack for this component.
+         *
+         * @since BuddyPress (2.4.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'] );
+                }
+        }
+
+        /**
          * Include bp-blogs files.
          *
          * @see BP_Component::includes() for description of parameters.
@@ -126 +225 @@
 
                 if ( is_multisite() ) {
                         $includes[] = 'widgets';
+
+                        // Conditional includes
+                        if ( bp_is_active( $this->id, 'blog' ) ) {
+                                $includes = array_merge( $includes, array(
+                                        'blog',
+                                        'notifications',
+                                        'adminbar',
+                                ) );
+                        }
                 }
 
                 // Include the files
@@ -159 +267 @@
                 } elseif ( bp_loggedin_user_domain() ) {
                         $user_domain = bp_loggedin_user_domain();
                 } else {
-                        return;
+                        $user_domain = false;
                 }
 
-                $slug       = bp_get_blogs_slug();
-                $parent_url = trailingslashit( $user_domain . $slug );
-
-                // 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 ), bp_core_number_format( $count )  );
-                $main_nav = array(
-                        'name'                => $nav_text,
-                        'slug'                => $slug,
-                        'position'            => 30,
-                        'screen_function'     => 'bp_blogs_screen_my_blogs',
-                        'default_subnav_slug' => 'my-sites',
-                        'item_css_id'         => $this->id
-                );
+                if ( ! empty( $user_domain ) ) {
+                        $slug       = bp_get_blogs_slug();
+                        $parent_url = trailingslashit( $user_domain . $slug );
+
+                        // 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 ), bp_core_number_format( $count ) );
+                        $main_nav = array(
+                                'name'                => $nav_text,
+                                'slug'                => $slug,
+                                'position'            => 30,
+                                'screen_function'     => 'bp_blogs_screen_my_blogs',
+                                'default_subnav_slug' => 'my-sites',
+                                'item_css_id'         => $this->id
+                        );
 
-                $sub_nav[] = array(
-                        'name'            => __( 'My Sites', 'buddypress' ),
-                        'slug'            => 'my-sites',
-                        'parent_url'      => $parent_url,
-                        'parent_slug'     => $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'     => $slug,
+                                'screen_function' => 'bp_blogs_screen_my_blogs',
+                                'position'        => 10
+                        );
+
+                        if ( bp_is_active( $this->id, 'blog' ) ) {
+                                $sub_nav[] = array(
+                                        'name'            => __( 'My Subscriptions', 'buddypress' ),
+                                        'slug'            => 'my-subscriptions',
+                                        'parent_url'      => $parent_url,
+                                        'parent_slug'     => $slug,
+                                        'screen_function' => 'bp_blogs_screen_my_blogs',
+                                        'position'        => 20
+                                );
+                        }
+                }
 
                 // Setup navigation
                 parent::setup_nav( $main_nav, $sub_nav );
+
+                // Build the blog navigation
+                if ( bp_is_blogs_component() && bp_is_single_item() ) {
+
+                        $item_main_nav = array( 'blog_home' => array(
+                                        'name'                => __( 'Home', 'buddypress' ),
+                                        'slug'                => 'home',
+                                        'position'            => 0,
+                                        'screen_function'     => 'bp_blogs_blog_screen_blog_home',
+                                        'default_subnav_slug' => false,
+                                ),
+                        );
+
+                        if ( bp_blogs_blog_current_blog_has_access() ) {
+                                // Fix the scope for Ajax filtering when members is the home page
+                                $item_main_nav['blog_home']['item_css_id'] = 'members';
+
+                                if ( $this->current_blog->front_template || ( bp_is_active( 'activity' ) && bp_blogs_blog_current_blog_is_public() ) ) {
+                                        /**
+                                         * Only add the members nav if it's not the home's nav
+                                         */
+                                        $item_main_nav[] = 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_blog_screen_blog_home',
+                                                'default_subnav_slug' => false,
+                                        );
+
+                                        // Default scope is home
+                                        $item_main_nav['blog_home']['item_css_id'] = 'home';
+
+                                        /**
+                                         * 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_blogs_blog_current_blog_is_public() ) {
+                                                $item_main_nav[] = array(
+                                                        'name'                => _x( 'Activity', 'Single Blog activity screen nav', 'buddypress' ),
+                                                        'slug'                => 'activity',
+                                                        'position'            => 10,
+                                                        'screen_function'     => 'bp_blogs_blog_screen_blog_home',
+                                                        'default_subnav_slug' => false,
+                                                );
+                                        }
+                                }
+
+                                // Manage Main nav
+                                $item_main_nav[] = array(
+                                        'name'                => _x( 'Manage', 'Single Blog manage screen nav', 'buddypress' ),
+                                        'slug'                => 'manage',
+                                        'position'            => 1000,
+                                        'screen_function'     => 'bp_blogs_blog_screen_blog_settings',
+                                        'default_subnav_slug' => 'manage',
+                                        'item_admin_only'     => true,
+                                );
+                        }
+
+                        /** Sub nav items - only manage needs some for now */
+                        $blog_link     = trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/'. $this->current_blog->slug );
+
+                        /**
+                         * General settings
+                         *
+                         * Edit the preferences for the current blog
+                         * Access is restricted to The blog admins
+                         */
+                        $item_sub_nav = array( array(
+                                'name'              => _x( 'Settings', 'Single Blog setting screen', 'buddypress' ),
+                                'slug'              => 'manage',
+                                'parent_url'        => trailingslashit( $blog_link . 'manage' ),
+                                'parent_slug'       => 'manage',
+                                'screen_function'   => 'bp_blogs_blog_screen_blog_settings',
+                                'position'          => 0,
+                                'item_admin_only'   => true,
+                                'show_in_admin_bar' => true,
+                        ) );
+
+                        /**
+                         * Site logo
+                         *
+                         * Edit the logo for the current blog
+                         * Access is restricted to The blog admins
+                         */
+                        if ( bp_blogs_blog_is_avatar_uploads_enabled() ) {
+                                $item_sub_nav[] = array(
+                                        'name'              => _x( 'Logo', 'Single Blog photo screen', 'buddypress' ),
+                                        'slug'              => 'edit-logo',
+                                        'parent_url'        => trailingslashit( $blog_link . 'manage' ),
+                                        'parent_slug'       => 'manage',
+                                        'screen_function'   => 'bp_blogs_blog_screen_blog_settings',
+                                        'position'          => 10,
+                                        'item_admin_only'   => true,
+                                        'show_in_admin_bar' => true,
+                                );
+                        }
+
+                        /**
+                         * Manage members (remove)
+                         */
+                        $item_sub_nav[] = array(
+                                'name'              => _x( 'Subscribers', 'Single Blog manage subscribers screen', 'buddypress' ),
+                                'slug'              => 'members',
+                                'parent_url'        => trailingslashit( $blog_link . 'manage' ),
+                                'parent_slug'       => 'manage',
+                                'screen_function'   => 'bp_blogs_blog_screen_blog_settings',
+                                'position'          => 20,
+                                'item_admin_only'   => true,
+                                'show_in_admin_bar' => true,
+                        );
+
+                        // Finally setup the blogs single item nav
+                        if ( is_a( $this->nav, 'BP_Single_Item_Navigation' ) ) {
+                                $this->nav->setup_nav( $item_main_nav, $item_sub_nav );
+                        }
+                }
         }
 
         /**
@@ -234 +471 @@
                                 'href'   => $blogs_link
                         );
 
+                        if ( bp_is_active( $this->id, 'blog' ) ) {
+                                $wp_admin_nav[] = array(
+                                        'parent' => 'my-account-' . $this->id,
+                                        'id'     => 'my-account-' . $this->id . '-my-subscriptions',
+                                        'title'  => __( 'My Subscriptions', 'buddypress' ),
+                                        'href'   => trailingslashit( $blogs_link . 'my-subscriptions' )
+                                );
+                        }
+
                         // Create a Site
                         if ( bp_blog_signup_enabled() ) {
                                 $wp_admin_nav[] = array(
@@ -261 +507 @@
                                 if ( bp_is_active( 'xprofile' ) ) {
                                         $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->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
@@ -286 +547 @@
 
                 // Global groups
                 wp_cache_add_global_groups( array(
-                        'blog_meta'
+                        'blog_meta',
+                        'bp_blogs'
                 ) );
 
                 parent::setup_cache_groups();
@@ -326 +588 @@
                 $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.4.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.4.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
+        $admins_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->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_blogs_blog_get_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 notification.
+
+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.4.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.4.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.4.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 ) ) {
+                        $admins_notified[] = $admin;
+                }
+        }
+
+        /**
+         * Fires after the notification is sent that a member subscribed to a site.
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param array         $admins_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_new_subscription_sent_email', $admins_notified, $subject, $message, $subscriber_id, $blog );
+}
+add_action( 'bp_blogs_blog_joined_blog', 'bp_blogs_notification_new_subscription', 10, 2 );
+
+/**
+ * Format notifications for the Blogs component.
+ *
+ * @since BuddyPress (2.4.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.4.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.4.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.4.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.4.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.4.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;
+}
+
+/**
+ * Render the blogs settings fields on the Notification Settings page.
+ *
+ * @since BuddyPress (2.4.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="blogs-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 blog settings fields on Notification Settings page.
+                         *
+                         * @since BuddyPress (2.4.0)
+                         */
+                        do_action( 'bp_blogs_screen_notification_settings' ); ?>
+
+                </tbody>
+        </table>
+
+<?php
+}
+add_action( 'bp_notification_settings', 'bp_blogs_screen_notification_settings', 20 );
+
+/**
+ * Mark notifications read when a member views their blogs.
+ *
+ * @since BuddyPress (2.4.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.4.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_blogs_blog_get_current_blog_id(), buddypress()->blogs->id, 'new_site_subscription' );
+        }
+}
+add_action( 'bp_blogs_blog_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.4.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.4.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

@@ -74 +74 @@
  * 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 +96 @@
          */
         public function is_blogs() {
 
-                // Bail if not looking at a group
-                if ( ! bp_is_blogs_component() )
+                // Bail if not looking at a blog
+                if ( ! bp_is_blogs_component() ) {
                         return;
+                }
 
                 // Bail if looking at a users sites
-                if ( bp_is_user() )
+                if ( bp_is_user() ) {
                         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 +123 @@
                         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'    ) );
+                }
         }
 
         /** Directory *************************************************************/
@@ -183 +189 @@
         }
 
         /**
-         * Filter the_content with the groups index template part.
+         * Filter the_content with the blogs index template part.
          *
          * @since BuddyPress (1.7.0)
          */
@@ -260 +266 @@
         public function create_content() {
                 return bp_buffer_template_part( 'blogs/create', null, false );
         }
+
+        /** Single ************************************************************/
+
+        /**
+         * Add custom template hierarchy to theme compat for blog single item pages.
+         *
+         * This is to mirror how WordPress has
+         * {@link https://codex.wordpress.org/Template_Hierarchy template hierarchy}.
+         *
+         * @since BuddyPress (2.4.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_blog_get_current_blog();
+
+                /**
+                 * Filters the Blogs single pages template hierarchy based on priority.
+                 *
+                 * @since BuddyPress (2.4.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->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.4.0)
+         */
+        public function single_dummy_post() {
+                bp_theme_compat_reset_post( array(
+                        'ID'             => 0,
+                        'post_title'     => bp_blogs_blog_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.4.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

@@ -190 +190 @@
          * @param string $per_page See {@link BP_Blogs_Blog::get()}.
          * @param string $max See {@link BP_Blogs_Blog::get()}.
          * @param string $user_id See {@link BP_Blogs_Blog::get()}.
+         * @param false|int $user_level whether to get all|only subscriber (0)
+         *                              or only contributors (1)
          * @param string $search_terms See {@link BP_Blogs_Blog::get()}.
          * @param string $page_arg The string used as a query parameter in
          *        pagination links. Default: 'bpage'.
          * @param bool $update_meta_cache Whether to pre-fetch metadata for
          *        queried blogs.
          * @param array $include_blog_ids Array of blog IDs to include.
+         * @param string $slug the slug of the blogs single item to get
          */
-        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, $user_level = false, $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 ( bp_is_active( 'blogs', 'blog' ) && 'single-blog' === $type ) {
+                        if ( bp_blogs_blog_get_current_blog() ) {
+                                $blog = bp_blogs_blog_get_current_blog();
+
+                        } else {
+                                $blog = bp_blogs_blog_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
@@ -214 +229 @@
                                 'per_page'          => $this->pag_num,
                                 'page'              => $this->pag_page,
                                 'user_id'           => $user_id,
+                                'user_level'        => $user_level,
                                 'search_terms'      => $search_terms,
                                 'update_meta_cache' => $update_meta_cache,
                                 'include_blog_ids'  => $include_blog_ids,
                         ) );
                 }
 
-                // 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->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 +422 @@
 function bp_has_blogs( $args = '' ) {
         global $blogs_template;
 
+        $type         = 'active';
+        $slug         = '';
+        $current_blog = '';
+        $user_level   = false;
+
+        if ( bp_is_active( 'blogs', 'blog' ) ) {
+                $current_blog = bp_blogs_blog_get_current_blog();
+
+                if ( bp_is_user() ) {
+                        // Defaults to blogs the user is a contributor of
+                        $user_level = 1;
+
+                        // On the My Subscriptions screen, blogs the user is a subsriber of
+                        if ( bp_is_current_action( 'my-subscriptions' ) ) {
+                                $user_level = 0;
+                        }
+                }
+        }
+
+        if ( ! empty( $current_blog ) ) {
+                $type = 'single-blog';
+                $slug = bp_blogs_blog_get_current_blog_slug();
+        }
+
         // Check for and use search terms
         $search_terms = ! empty( $_REQUEST['s'] )
                 ? $_REQUEST['s']
@@ -402 +453 @@
 
         // 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,
                 'max'               => false,
                 'user_id'           => bp_displayed_user_id(), // Pass a user_id to limit to only blogs this user is a member of
+                'user_level'        => $user_level,
                 '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 +472 @@
         }
 
         // 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['user_level'], $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 +608 @@
                         '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,
                 ) );
 
+                // 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';
+
+                if ( bp_is_active( 'blogs', 'blog' ) ) {
+                        $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 );
+                }
+
                 // 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'],
@@ -576 +644 @@
                 ) );
 
                 /***
-                 * 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.
+                 *
+                 * @deprecated BuddyPress (2.4.0)
                  */
                 $avatar = apply_filters( 'bp_get_blog_avatar_' . $blogs_template->blog->blog_id, $avatar );
 
@@ -1375 +1441 @@
                 <?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_blog_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.

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

@@ -21 +21 @@
         public $id;
         public $user_id;
         public $blog_id;
+        public $is_contributor;
 
         /**
          * Constructor method.
          *
          * @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(
+                        'blog_id'         => 0,
+                        'user_id'         => 0,
+                        'populate_extras' => false,
+                ) );
+
+                if ( ! empty( $id ) || ! empty( $this->args[ 'blog_id'] ) ) {
                         $this->id = $id;
                         $this->populate();
                 }
@@ -42 +49 @@
 
                 $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'] ) ) {
 
-                $this->user_id = $blog->user_id;
-                $this->blog_id = $blog->blog_id;
+                        // 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->args['blog_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->blog_id = 0;
+                                return;
+                        }
+
+                        // Set the blog id
+                        $this->blog_id = (int) $this->args['blog_id'];
+
+                        // Populating BuddyPress blog metas for the requested blog
+                        foreach ( bp_blogs_get_blogmeta( $this->blog_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();
+
+                        if ( (int) $current_site->id === (int) $this->blog_id ) {
+                                $this->slug = bp_blogs_blog_get_site_slug();
+                        } else {
+                                $this->slug = trim( str_replace( $current_site->path, '', $this->path ), '/' );
+                        }
+
+                        if ( bp_get_root_blog_id() !== $this->blog_id ) {
+                                $needs_reset = true;
+                                switch_to_blog( $this->blog_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 posts ?
+                        $this->post_count = $blog_details->post_count;
+
+                        // Blog visibility
+                        $this->blog_public = $blog_details->public;
+
+                        /**
+                         * Custom header, filter here to disable, or use another image than
+                         * @var [type]
+                         */
+                        $this->custom_header = apply_filters( 'bp_blogs_blog_get_custom_header', get_header_image(), $this->blog_id );
+
+                        if ( isset( $needs_reset ) ) {
+                                restore_current_blog();
+                        }
+
+                        // How many users ?
+                        $this->members            = bp_blogs_blog_get_users_for_blog( array( 'blog_id' => $this->blog_id ) );
+                        $this->total_member_count = count( $this->members );
+
+                        $this->is_member      = false;
+                        $this->is_contributor = false;
+
+                        /**
+                         * Loop throw members to see if the logged in user is a member of the blog
+                         * and if he's a contributor of the blog
+                         */
+                        foreach ( (array) $this->members as $member ) {
+                                if ( (int) $member->user_id === (int) bp_loggedin_user_id() ) {
+                                        $this->is_member = true;
+
+                                        if ( 1 === (int) $member->is_contributor ) {
+                                                $this->is_contributor = true;
+                                        }
+                                }
+                        }
+
+                /**
+                 * Populate the user's blog association single row
+                 *
+                 * @see bp_blogs_add_user_to_blog()
+                 */
+                } else {
+                        $select = "SELECT * FROM {$bp->blogs->table_name}";
+
+                        // Use the blog_id and the user_id
+                        if ( ! empty( $this->args[ 'blog_id'] ) && ! empty( $this->args[ 'user_id'] ) ) {
+                                $where = $wpdb->prepare( 'user_id = %d AND blog_id = %d', $this->args[ 'user_id'], $this->args[ 'blog_id'] );
+
+                        // Use the id of the association
+                        } elseif ( ! empty( $this->id ) ) {
+                                $where = $wpdb->prepare( 'id = %d', $this->id );
+
+                        // Not enough data to get the blog's row
+                        } else {
+                                $this->id = null;
+                                return;
+                        }
+
+                        $blog = $wpdb->get_row( "{$select} WHERE {$where}" );
+
+                        if ( ! empty( $blog->id ) ) {
+                                $this->id             = (int) $blog->id;
+                                $this->user_id        = (int) $blog->user_id;
+                                $this->blog_id        = (int) $blog->blog_id;
+                                $this->is_contributor = $blog->is_contributor;
+                        }
+                }
         }
 
         /**
@@ -56 +189 @@
         public function save() {
                 global $wpdb;
 
-                $this->user_id = apply_filters( 'bp_blogs_blog_user_id_before_save', $this->user_id, $this->id );
-                $this->blog_id = apply_filters( 'bp_blogs_blog_id_before_save', $this->blog_id, $this->id );
+                $this->user_id        = apply_filters( 'bp_blogs_blog_user_id_before_save', $this->user_id, $this->id );
+                $this->blog_id        = apply_filters( 'bp_blogs_blog_id_before_save', $this->blog_id, $this->id );
+                $this->is_contributor = apply_filters( 'bp_blogs_blog_is_contributor_before_save', $this->is_contributor, $this->id );
 
                 /**
                  * Fires before the current blog item gets saved.
@@ -82 +216 @@
 
                 if ( $this->id ) {
                         // Update
-                        $sql = $wpdb->prepare( "UPDATE {$bp->blogs->table_name} SET user_id = %d, blog_id = %d WHERE id = %d", $this->user_id, $this->blog_id, $this->id );
+                        $sql = $wpdb->prepare( "UPDATE {$bp->blogs->table_name} SET user_id = %d, blog_id = %d, is_contributor = %d WHERE id = %d", $this->user_id, $this->blog_id, $this->is_contributor, $this->id );
                 } else {
                         // Save
-                        $sql = $wpdb->prepare( "INSERT INTO {$bp->blogs->table_name} ( user_id, blog_id ) VALUES ( %d, %d )", $this->user_id, $this->blog_id );
+                        $sql = $wpdb->prepare( "INSERT INTO {$bp->blogs->table_name} ( user_id, blog_id, is_contributor ) VALUES ( %d, %d, %d )", $this->user_id, $this->blog_id, $this->is_contributor );
                 }
 
                 if ( !$wpdb->query($sql) )
@@ -135 +269 @@
          *        Default: false (unlimited results).
          * @param int $user_id Optional. ID of the user whose blogs are being
          *        retrieved. Default: 0.
+         * @param int|bool $user_level Optional. level of the user on the blogs to
+         *        retrieve (1 => contributor, 0 => subscriber). Default: false.
          * @param string|bool $search_terms Optional. Search by text stored in
          *        blogmeta (such as the blog name). Default: false.
          * @param bool $update_meta_cache Whether to pre-fetch metadata for
@@ -144 +280 @@
          *           'blogs' - Array of located blog objects
          *           'total' - A count of the total blogs matching the filter params
          */
-        public static function get( $type, $limit = false, $page = false, $user_id = 0, $search_terms = false, $update_meta_cache = true, $include_blog_ids = false ) {
+        public static function get( $type, $limit = false, $page = false, $user_id = 0, $user_level = false, $search_terms = false, $update_meta_cache = true, $include_blog_ids = false ) {
                 global $wpdb;
 
                 $bp = buddypress();
@@ -187 +323 @@
                         $search_terms_sql = '';
                 }
 
+                // Defaults to all blogs for user
+                $user_level_sql = '';
+
+                /**
+                 * Force the user level to be contributor if the blog
+                 * single items feature is disabled
+                 */
+                if ( ! bp_is_active( 'blogs', 'blog' ) ) {
+                        $user_level = 1;
+                }
+
+                if ( false !== $user_level ) {
+                        $user_level_sql = $wpdb->prepare( 'AND b.is_contributor = %d', $user_level );
+                }
+
                 $paged_blogs = $wpdb->get_results( "
                         SELECT b.blog_id, b.user_id as admin_user_id, u.user_email as admin_user_email, wb.domain, wb.path, bm.meta_value as last_activity, bm_name.meta_value as name
                         FROM
@@ -199 +350 @@
                         WHERE
                           wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$hidden_sql}
                           AND bm.meta_key = 'last_activity' AND bm_name.meta_key = 'name' AND bm_description.meta_key = 'description'
-                          {$search_terms_sql} {$user_sql} {$include_sql}
+                          {$search_terms_sql} {$user_sql} {$user_level_sql} {$include_sql}
                         GROUP BY b.blog_id {$order_sql} {$pag_sql}
                 " );
 
@@ -214 +365 @@
                           wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$hidden_sql}
                           AND
                           bm_name.meta_key = 'name' AND bm_description.meta_key = 'description'
-                          {$search_terms_sql} {$user_sql} {$include_sql}
+                          {$search_terms_sql} {$user_sql} {$user_level_sql} {$include_sql}
                 " );
 
                 $blog_ids = array();
@@ -241 +392 @@
                 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 ) );
@@ -376 +527 @@
          *        queried. Defaults to logged-in user.
          * @return int Blog count for the user.
          */
-        public static function total_blog_count_for_user( $user_id = null ) {
+        public static function total_blog_count_for_user( $user_id = null, $is_contributor = false ) {
                 global $wpdb;
 
                 $bp = buddypress();
 
-                if ( !$user_id )
+                if ( ! $user_id ) {
                         $user_id = bp_displayed_user_id();
+                }
+
+                $sql = array(
+                        'select'  => "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id",
+                        'where'   => array( $wpdb->prepare( "wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id ) ),
+                );
+
+                if ( ! is_user_logged_in() && (int) $user_id !== (int) bp_loggedin_user_id() && ! bp_current_user_can( 'bp_moderate' ) ) {
+                        $sql['where'][] = 'wb.public = 1';
+                }
+
+                /**
+                 * Force to blogs the user is contributing to if the blog
+                 * single items feature is disabled
+                 */
+                if ( ! bp_is_active( 'blogs', 'blog' ) ) {
+                        $is_contributor = 1;
+                }
+
+                if ( false !== $is_contributor ) {
+                        $sql['where'][] = $wpdb->prepare( 'b.is_contributor = %d', $is_contributor );
+                }
+
+                // Build the where part of the query
+                $sql['where'] = 'WHERE ' . implode( ' AND ', $sql['where'] );
+
+                return $wpdb->get_var( "{$sql['select']} {$sql['where']}" );
 
                 // If the user is logged in return the blog count including their hidden blogs.
                 if ( ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) || bp_current_user_can( 'bp_moderate' ) ) {
@@ -605 +783 @@
 
                 return $user_blog;
         }
+
+        /**
+         * List members of a blog
+         *
+         * @since BuddyPress ( 2.4.0 )
+         *
+         * @param int $blog_id ID of blog.
+         * @param int|bool 0 to get only subscribers, 1 to get only contributors, false to get all
+         * @return array of blog members object
+         */
+        public static function get_users_for_blog( $blog_id, $is_contributor = false ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                $sql = array(
+                        'select'  => "SELECT * FROM {$bp->blogs->table_name}",
+                        'where'   => array( $wpdb->prepare( "blog_id = %d", $blog_id ) ),
+                );
+
+                if ( false !== $is_contributor ) {
+                        $sql['where'][] = $wpdb->prepare( "is_contributor = %d", $is_contributor );
+                }
+
+                // Build the where part of the query
+                $sql['where'] = 'WHERE ' . implode( ' AND ', $sql['where'] );
+
+                return $wpdb->get_results( "{$sql['select']} {$sql['where']}" );
+        }
 }

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

@@ -437 +437 @@
                                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                                 user_id bigint(20) NOT NULL,
                                 blog_id bigint(20) NOT NULL,
+                                is_contributor tinyint(1) NOT NULL DEFAULT '1',
                                 KEY user_id (user_id),
-                                KEY blog_id (blog_id)
+                                KEY blog_id (blog_id),
+                                KEY is_contributor (is_contributor)
                         ) {$charset_collate};";
 
         $sql[] = "CREATE TABLE {$bp_prefix}bp_user_blogs_blogmeta (

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

@@ -194 +194 @@
 <?php
 }
 
+/** Blogs Section ************************************************************/
+
+/**
+ * Blogs settings section description for the settings page
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_admin_setting_callback_blogs_section() { }
+
+/**
+ * Disable the Blogs single items
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @uses checked() To display the checked attribute
+ */
+function bp_admin_setting_callback_blog_avatar_uploads() {
+?>
+
+        <input id="bp-disable-blog-avatar-uploads" name="bp-disable-blog-avatar-uploads" type="checkbox" value="1" <?php checked( ! bp_blogs_blog_disable_avatar_uploads() ); ?> />
+        <label for="bp-disable-blog-avatar-uploads"><?php _e( 'Allow customizable avatars for sites', 'buddypress' ); ?></label>
+<?php
+}
+
 /** Forums Section ************************************************************/
 
 /**
@@ -297 +321 @@
                         'bp-disable-account-deletion',
                         'bp-disable-avatar-uploads',
                         'bp-disable-group-avatar-uploads',
+                        'bp-disable-blog-avatar-uploads',
                         'bp_disable_blogforum_comments',
                         'bp-disable-profile-sync',
                         'bp_restrict_group_creation',

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

@@ -277 +277 @@
         // Default to unrepaired
         $repair    = false;
 
+        /**
+         * To completely reset the users/blogs association
+         * the Blog single item feature needs to be disabled.
+         * This is to avoid removing blogs subscriptions.
+         */
+        $reset = ! bp_is_active( 'blogs', 'blog' );
+
         // Run function if blogs component is active
         if ( bp_is_active( 'blogs' ) ) {
-                $repair = bp_blogs_record_existing_blogs();
+                $repair = bp_blogs_record_existing_blogs( $reset );
         }
 
         // Setup success/fail messaging

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

@@ -395 +395 @@
                                 register_setting( 'buddypress', '_bp_enable_akismet', 'intval' );
                         }
                 }
+
+                /** Blogs Section ****************************************************/
+
+                if ( bp_is_active( 'blogs', 'blog' ) && is_multisite() ) {
+
+                        // Add the main section
+                        add_settings_section( 'bp_blogs', __( 'Sites Settings',  'buddypress' ), 'bp_admin_setting_callback_blogs_section', 'buddypress' );
+
+                        // Allow subscriptions setting
+                        add_settings_field( 'bp-disable-blog-avatar-uploads', __( 'Site Photo Uploads', 'buddypress' ), 'bp_admin_setting_callback_blog_avatar_uploads', 'buddypress', 'bp_blogs' );
+                        register_setting  ( 'buddypress', 'bp-disable-blog-avatar-uploads', 'intval' );
+                }
         }
 
         /**

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

@@ -328 +328 @@
                         // 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', 'blog' ) ) {
+                                        $params['item_id'] = bp_blogs_blog_get_current_blog_id();
+                                } else {
+                                        $params['item_id'] = false;
+                                }
+
                                 break;
 
                         case 'group' :
@@ -664 +669 @@
         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', 'blog' ) ) {
+                        $item_id = bp_blogs_blog_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 );
@@ -920 +926 @@
                                 'populate_extras' => false,
                         ) );
                 }
+        } elseif ( 'blog' === $bp_params['object'] && bp_is_active( 'blogs', 'blog' ) ) {
+                $bp_params['upload_dir_filter'] = 'blogs_avatar_upload_dir';
+
+                if ( ! bp_blogs_blog_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
@@ -1821 +1837 @@
                 }
         }
 
+        if ( bp_is_active( 'blogs', 'blog' ) && bp_is_blog_manage_screen( 'edit-logo' ) ) {
+                $retval = ! bp_blogs_blog_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-classes.php

@@ -23 +23 @@
 require dirname( __FILE__ ) . '/classes/class-bp-media-extractor.php';
 require dirname( __FILE__ ) . '/classes/class-bp-attachment.php';
 require dirname( __FILE__ ) . '/classes/class-bp-attachment-avatar.php';
+require dirname( __FILE__ ) . '/classes/class-bp-single-item-navigation.php';

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}->nav->main ) ) {
+                        $component_nav_section = '';
+
+                        // Get the component nav section name
+                        foreach ( $bp->{$bp->current_component}->nav->main 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

@@ -58 +58 @@
                 // Group Profile Photos
                 'bp-disable-group-avatar-uploads' => false,
 
+                // Blog Profile Photos
+                'bp-disable-blog-avatar-uploads'  => false,
+
                 // Allow users to delete their own accounts
                 'bp-disable-account-deletion'     => false,
 
@@ -618 +621 @@
 }
 
 /**
+ * Are blog avatars disabled?
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param bool $default Optional. Fallback value if not found in the database.
+ *                      Defaults: False.
+ * @return bool True if blog avatar uploads are disabled, otherwise false.
+ */
+function bp_blogs_blog_disable_avatar_uploads( $default = false ) {
+        /**
+         * Filters whether or not members are able to upload blog avatars.
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param bool $disabled Whether or not members are able to upload their blog avatars.
+         * @param bool $default  Default value passed to the function.
+         */
+        return (bool) apply_filters( 'bp_blogs_blog_disable_avatar_uploads', (bool) bp_get_option( 'bp-disable-blog-avatar-uploads', $default ) );
+}
+
+/**
  * Are members able to delete their own accounts?
  *
  * @since BuddyPress (1.6.0)

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

@@ -87 +87 @@
 }
 
 /**
+ * Output a component's single item main nav
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param  string $component the component id
+ */
+function bp_single_item_main_nav( $component = '' ) {
+        $bp = buddypress();
+
+        if ( empty( $component ) ) {
+                $component = bp_current_component();
+        }
+
+        if ( ! isset( $bp->{$component}->nav ) || ! is_a( $bp->{$component}->nav, 'BP_Single_Item_Navigation' ) ) {
+                return;
+        }
+
+        $bp->{$component}->nav->display_main_nav();
+}
+
+/**
+ * Output a component's single item options nav
+ *
+ * @since BuddyPress (2.4.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_sub_nav( $component = '' ) {
+        $bp = buddypress();
+
+        if ( empty( $component ) ) {
+                $component = bp_current_component();
+        }
+
+        if ( ! bp_is_single_item() || ! isset( $bp->{$component}->nav ) || ! is_a( $bp->{$component}->nav, 'BP_Single_Item_Navigation' ) ) {
+                return;
+        }
+
+        $bp->{$component}->nav->display_sub_nav();
+}
+
+/**
  * Get the 'bp_options_title' property from the BP global.
  *
  * Not currently used in BuddyPress.
@@ -2564 +2609 @@
  * @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() && ! bp_is_user() ) {
                 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.4.0)
+ *
+ * @return bool True if the current page is part of a single blog.
+ */
+function bp_is_blog() {
+        $retval = bp_is_active( 'blogs', 'blog' );
+
+        if ( ! empty( $retval ) ) {
+                $retval = bp_is_blogs_component() && bp_blogs_blog_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.4.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.4.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.4.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.4.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' ) );
+}
+
+/**
+ * Is the current page a specific blog manage screen?
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param string $slug
+ * @return bool
+ */
+function bp_is_blog_manage_screen( $slug = '' ) {
+        return (bool) ( bp_is_blog_manage() && bp_is_action_variable( $slug ) );
+}
+
 /** Messages ******************************************************************/
 
 /**

src/bp-core/bp-core-update.php

@@ -258 +258 @@
                 if ( $raw_db_version < 9615 ) {
                         bp_update_to_2_3();
                 }
+
+                // 2.4.0
+                if ( $raw_db_version < 9943 ) {
+                        bp_update_to_2_4();
+                }
         }
 
         /** All done! *************************************************************/
@@ -482 +487 @@
 }
 
 /**
+ * 2.4.0 update routine.
+ *
+ * - Add the is_contributor field to the bp_user_blogs table
+ *
+ * @since BuddyPress (2.4.0)
+ */
+function bp_update_to_2_4() {
+        // Also handled by `bp_core_install()`
+        if ( bp_is_active( 'blogs' ) ) {
+                bp_core_install_blog_tracking();
+        }
+}
+
+/**
  * Updates the component field for new_members type.
  *
  * @since BuddyPress (2.2.0)

src/bp-core/bp-core-wpabstraction.php

@@ -217 +217 @@
                 }
         }
 }
+
+/**
+ * WordPress user_can() function does not have an equivalent for multisite configs
+ *
+ * @since BuddyPress (2.4.0)
+ *
+ * @param  int    $user_id the user ID we need to check the capability for
+ * @param  string $capability the cpability to check
+ * @param  int    $blog_id the blog id to check the capability for
+ * @return bool  True if user can for the requested blog, false otherwise
+ */
+function bp_user_can_for_blog( $user_id, $capability, $blog_id = 0 ) {
+        // Bail if no valid user_id provided
+        if ( empty( $user_id ) ) {
+                return false;
+        }
+
+        if ( empty( $blog_id ) ) {
+                $blog_id = get_current_blog_id();
+        }
+
+        if ( is_multisite() && (int) $blog_id !== (int) bp_get_root_blog_id() ) {
+                switch_to_blog( $blog_id );
+                $switched = true;
+        }
+
+        $can = user_can( $user_id, $capability );
+
+        if ( ! empty( $switched ) ) {
+                restore_current_blog();
+        }
+
+        return $can;
+}

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

@@ -312 +312 @@
         }
 
         /**
+         * Get the blog id to set its avatar
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @return integer the blog id
+         */
+        private function get_blog_id() {
+                $blog_id = 0;
+
+                if ( bp_is_blog() ) {
+                        $blog_id = bp_blogs_blog_get_current_blog_id();
+                }
+
+                return $blog_id;
+        }
+
+        /**
          * Build script datas for the Uploader UI
          *
          * @since BuddyPress (2.3.0)
@@ -331 +348 @@
                 // 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
@@ -373 +391 @@
                                 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-core/classes/class-bp-single-item-navigation.php

@@ +1 @@
+<?php
+/**
+ * Core component classes.
+ *
+ * @package BuddyPress
+ * @subpackage Core
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * API to create a component's single item navigation.
+ *
+ * @since BuddyPress (2.4.0)
+ */
+class BP_Single_Item_Navigation {
+
+        /**
+         * The single item main nav
+         *
+         * @since BuddyPress (2.4.0)
+         * @var array
+         */
+        public $main = array();
+
+        /**
+         * The single item sub nav
+         *
+         * @since BuddyPress (2.4.0)
+         * @var array
+         */
+        public $sub  = array();
+
+        /**
+         * The default args to be merged with the
+         * ones passed to the constructor
+         *
+         * @since BuddyPress (2.4.0)
+         * @var array
+         */
+        protected $default_args = array(
+                'component_id'   => '',
+                'component_slug' => '',
+                'single_item'    => '',
+        );
+
+        /**
+         * Constructor
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param array $args {
+         *     Array of arguments.
+         *     @type string $component_id String describing the component id (eg: blogs, groups...).
+         *     @type string $component_slug The root slug of the component (eg: blogs, sites, groups...)
+         *     @type string $single_item Required. The single item name (eg: blog, group...)
+         * }
+         */
+        public function __construct( $args = array() ) {
+                if ( empty( $args['single_item'] ) ) {
+                        return false;
+                }
+
+                // Merge args
+                $params = wp_parse_args( $args, $this->default_args, $args['single_item'] . '_single_nav_params' );
+
+                foreach ( $params as $key => $param ) {
+                        // Sanitize slug
+                        if ( 'component_slug' === $key ) {
+                                $this->{$key} = sanitize_title( $param );
+
+                        // Sanitize other keys
+                        } else {
+                                $this->{$key} = sanitize_key( $param );
+                        }
+                }
+
+                // Use the current component as a fallback
+                if ( empty( $component_id ) ) {
+                        $this->component_id = bp_current_component();
+                }
+
+                // Use the component root slug as a fallback
+                if ( empty( $component_id ) && is_callable( 'bp_get_' . $this->component_id . '_root_slug' ) ) {
+                        $this->component_slug = call_user_func( 'bp_get_' . $this->component_id . '_root_slug' );
+                }
+        }
+
+        /**
+         * Setup the single item navigation
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param  array  $main_nav list of associative arrays containing the nav items params
+         * @param  array  $sub_nav  list of associative arrays containing the sub nav items params
+         */
+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+                // Bail if the component slug or the component id are not set
+                if ( ! $this->component_slug || ! $this->component_id ) {
+                        return false;
+                }
+
+                // No sub nav items without a main nav item
+                if ( ! empty( $main_nav ) ) {
+                        foreach( (array) $main_nav as $item ) {
+                                $this->new_main_nav_item( $item );
+                        }
+
+                        // Sub nav items are not required
+                        if ( ! empty( $sub_nav ) ) {
+                                foreach( (array) $sub_nav as $sub_item ) {
+                                        $this->new_sub_nav_item( $sub_item );
+                                }
+                        }
+                }
+
+                /**
+                 * Fires at the end of the setup_nav method inside BP_Single_Item_Navigation.
+                 *
+                 * This is a dynamic hook that is based on the component string ID.
+                 *
+                 * @since BuddyPress (2.4.0)
+                 */
+                do_action( 'bp_' . $this->component_id . '_single_item_setup_nav' );
+        }
+
+        /**
+         * Add a new nav item to main nav
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param  array  $args associative array containing the item params
+         */
+        public function new_main_nav_item( $args = array() ) {
+                // Bail if the component slug or the component id are not set
+                if ( ! $this->component_slug || ! $this->component_id ) {
+                        return false;
+                }
+
+                // Get BuddyPress instance
+                $bp = buddypress();
+
+                $slug = false;
+                if ( ! empty( $args['slug'] ) ) {
+                        $slug = $args['slug'];
+                }
+
+                $item = bp_parse_args( $args, array(
+                        'name'                    => false, // Display name for the nav item
+                        'slug'                    => false, // URL slug for the nav item
+                        'item_css_id'             => false, // The CSS ID to apply to the HTML of the nav item
+                        'item_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
+                ), $this->single_item . '_main_nav_item_' . $slug );
+
+                // If we don't have the required info we need, don't create this nav item
+                if ( empty( $item['name'] ) || empty( $item['slug'] ) || empty( $item['screen_function'] ) ) {
+                        return false;
+                }
+
+                // If this is for site admins only and the user is not one, don't create the subnav item
+                if ( ! empty( $item['item_admin_only'] ) && ! bp_is_item_admin() ) {
+                        return false;
+                }
+
+                if ( empty( $item['item_css_id'] ) ) {
+                        $item['item_css_id'] = $item['slug'];
+                }
+
+                /**
+                 * Link is composed by:
+                 * 1. the root domain          eg: http://site.url
+                 * 2. the component root slug  eg: sites
+                 * 3. the current item slug    eg: blog_slug
+                 * 4. the nav item slug        eg: home
+                 */
+                $link = bp_get_root_domain() . '/' . $this->component_slug . '/' . bp_current_item() . '/' . $item['slug'];
+
+                $this->main[ $item['slug'] ] = array(
+                        'name'                    => $item['name'],
+                        'slug'                    => $item['slug'],
+                        'link'                    => trailingslashit( $link ),
+                        'css_id'                  => $item['item_css_id'],
+                        'position'                => $item['position'],
+                        'screen_function'         => &$item['screen_function'],
+                        'default_subnav_slug'     => $item['default_subnav_slug']
+                );
+
+                /**
+                 * If this condition is true, this means the url looks like
+                 * http://site.url/sites/blog_slug/home
+                 */
+                if ( bp_is_current_action( $item['slug'] ) ) {
+                        /**
+                         * If the default subnav match the first action variable move all left
+                         */
+                        if ( ! empty( $item['default_subnav_slug'] ) && bp_is_action_variable( $item['default_subnav_slug'], 0 ) && ! bp_action_variable( 1 ) ) {
+                                unset( $bp->canonical_stack['action_variables'][0] );
+
+                        // No action variable it's the root of the nav
+                        } elseif ( ! bp_action_variable( 0 ) ) {
+
+                                // Add our screen hook if screen function is callable
+                                if ( is_callable( $item['screen_function'] ) ) {
+                                        add_action( 'bp_screens', $item['screen_function'], 3 );
+                                }
+
+                                if ( ! empty( $item['default_subnav_slug'] ) ) {
+                                        /**
+                                         * Filters the component's single nav default subnav item.
+                                         *
+                                         * @since BuddyPress (2.4.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_single_item_default_subnav', $item['default_subnav_slug'], $item );
+                                }
+                        }
+                }
+        }
+
+        /**
+         * Add a new sub nav item to sub nav
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param  array  $args associative array containing the sub item params
+         */
+        public function new_sub_nav_item( $args = array() ) {
+                // Bail if the component slug or the component id are not set
+                if ( ! $this->component_slug || ! $this->component_id ) {
+                        return false;
+                }
+
+                $slug = false;
+                if ( ! empty( $args['slug'] ) ) {
+                        $slug = $args['slug'];
+                }
+
+                $sub_item = bp_parse_args( $args, array(
+                        'name'              => false, // Display name for the nav item
+                        'slug'              => false, // URL slug for the nav item
+                        'parent_slug'       => false, // URL slug of the parent nav item
+                        'parent_url'        => false, // URL of the parent item
+                        'item_css_id'       => false, // The CSS ID to apply to the HTML of the nav item
+                        'user_has_access'   => true,  // Can the logged in user see this nav item?
+                        'no_access_url'     => '',
+                        'item_admin_only'   => false, // Can only site admins see this nav item?
+                        'position'          => 90,    // Index of where this nav item should be positioned
+                        '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
+                ), $this->single_item . '_sub_nav_item_' . $slug );
+
+
+                // If we don't have the required info we need, don't create this subnav item
+                if ( empty( $sub_item['name'] ) || empty( $sub_item['slug'] ) || empty( $sub_item['parent_slug'] ) || empty( $sub_item['parent_url'] ) || empty( $sub_item['screen_function'] ) ) {
+                        return false;
+                }
+
+                // If this is for site admins only and the user is not one, don't create the subnav item
+                if ( ! empty( $sub_item['item_admin_only'] ) && ! bp_is_item_admin() ) {
+                        return false;
+                }
+
+                if ( empty( $sub_item['link'] ) ) {
+                        $sub_item['link'] = trailingslashit( $sub_item['parent_url'] . $sub_item['slug'] );
+
+                        // If this sub item is the default for its parent, skip the slug
+                        if ( $sub_item['slug'] === $this->main[ $sub_item['parent_slug'] ]['default_subnav_slug'] ) {
+                                $sub_item['link'] = trailingslashit( $sub_item['parent_url'] );
+                        }
+                }
+
+                if ( empty( $sub_item['item_css_id'] ) ) {
+                        $sub_item['item_css_id'] = $sub_item['slug'];
+                }
+
+                $this->sub[ $sub_item['parent_slug'] ][ $sub_item['slug'] ] = array(
+                        'name'              => $sub_item['name'],
+                        'link'              => $sub_item['link'],
+                        'slug'              => $sub_item['slug'],
+                        'css_id'            => $sub_item['item_css_id'],
+                        'position'          => $sub_item['position'],
+                        'user_has_access'   => $sub_item['user_has_access'],
+                        'no_access_url'     => $sub_item['no_access_url'],
+                        'screen_function'   => &$sub_item['screen_function'],
+                        'show_in_admin_bar' => (bool) $sub_item['show_in_admin_bar'],
+                );
+
+                if ( ! bp_is_current_component( $this->component_id ) && ! bp_is_current_action( $sub_item['parent_slug'] ) ) {
+                        return false;
+                }
+
+                if ( bp_action_variable( 0 ) && bp_is_action_variable( $sub_item['slug'], 0 ) ) {
+
+                        $hooked = bp_core_maybe_hook_new_subnav_screen_function( $this->sub[ $sub_item['parent_slug'] ][ $sub_item['slug'] ] );
+
+                        // 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'] );
+                        }
+                }
+        }
+
+        /**
+         * Sort the main nav items and output the main nav.
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @return HTML output
+         */
+        public function display_main_nav() {
+                // Bail if the component slug or the component id are not set
+                if ( ! $this->component_slug || ! $this->component_id ) {
+                        return false;
+                }
+
+                // Sort the main nav just before it's displayed
+                $this->main = bp_sort_by_key( $this->main, 'position', 'num' );
+
+                // Loop throw each nav item
+                foreach ( (array) $this->main as $main_nav_item ) {
+                        // Defaults to none
+                        $selected = '';
+
+                        if ( bp_is_current_action( $main_nav_item['slug'] ) ) {
+                                $selected = ' class="current selected"';
+                        }
+
+                        /**
+                         * Filters the component's "main nav", the first-level single item navigation menu.
+                         *
+                         * This is a dynamic filter that is dependent on the component's single item and the provided css_id value.
+                         *
+                         * @since BuddyPress (2.4.0)
+                         *
+                         * @param string $value         HTML list item for the submenu item.
+                         * @param array  $subnav_item   Main nav array item being displayed.
+                         */
+                        echo apply_filters_ref_array( 'bp_' . $this->single_item . '_main_nav_' . $main_nav_item['css_id'], array( '<li id="' . esc_attr( $main_nav_item['css_id'] ) . '-' . esc_attr( $this->component_id ) . '-li" ' . $selected . '><a id="' . esc_attr( $this->single_item ) . '-' . esc_attr( $main_nav_item['slug'] ) . '" href="' . esc_url( $main_nav_item['link'] ) . '">' . $main_nav_item['name'] . '</a></li>', &$main_nav_item ) );
+                }
+        }
+
+        /**
+         * Sort the sub nav items and output the sub nav
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @return HTML output
+         */
+        public function display_sub_nav() {
+                // Bail if the component slug or the component id are not set
+                if ( ! $this->component_slug || ! $this->component_id ) {
+                        return false;
+                }
+
+                $the_index = bp_current_action();
+
+                if ( bp_action_variable( 0 ) ) {
+                        $selected_item = bp_action_variable( 0 );
+                } else {
+                        $selected_item = $the_index;
+                }
+
+                if ( empty( $this->sub[ $the_index ] ) ) {
+                        return;
+                }
+
+                // Sort the main nav just before it's displayed
+                $this->sub[ $the_index ] = bp_sort_by_key( $this->sub[ $the_index ], 'position', 'num' );
+
+                // Loop throw each nav item
+                foreach ( (array) $this->sub[ $the_index ] as $sub_nav_item ) {
+
+                        if ( empty( $sub_nav_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 ( $sub_nav_item['slug'] === $selected_item ) {
+                                $selected = ' class="current selected"';
+                        } else {
+                                $selected = '';
+                        }
+
+                        /**
+                         * Filters the component's "single nav", the secondary-level single item navigation menu.
+                         *
+                         * This is a dynamic filter that is dependent on the component's id and the provided css_id value.
+                         *
+                         * @since BuddyPress (2.4.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_' . $this->single_item . '_single_subnav_' . $sub_nav_item['css_id'], '<li id="' . esc_attr( $sub_nav_item['css_id'] . '-' . $this->component_id . '-' . $this->single_item . '-li' ) . '" ' . $selected . '><a id="' . esc_attr( $sub_nav_item['css_id'] ) . '" href="' . esc_url( $sub_nav_item['link'] ) . '">' . $sub_nav_item['name'] . '</a></li>', $sub_nav_item, $selected_item );
+                }
+        }
+
+        /**
+         * Get the sub nav items for the provided parent slug
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param  string $parent_slug the main nav parent slug
+         * @return HTML   output
+         */
+        public function get_sub_nav_by_parent_slug( $parent_slug = '' ) {
+                if ( empty( $parent_slug ) || empty( $this->sub[ $parent_slug ] ) ) {
+                        return false;
+                }
+
+                // Sort the sub nav items
+                $this->sub[ $parent_slug ] = bp_sort_by_key( $this->sub[ $parent_slug ], 'position', 'num' );
+
+                return $this->sub[ $parent_slug ];
+        }
+
+        /**
+         * Remove a main nav item for component's single item
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param  string $component        the component id
+         * @param  string $main_nav_item_id the main nav item id
+         * @return bool                     true if the main nav was removed, false otherwise
+         */
+        public static function remove_main_nav_item( $component ='', $main_nav_item_id = '' ) {
+                $bp = buddypress();
+
+                if ( empty( $component ) || empty( $main_nav_item_id ) || ! isset( $bp->{$component}->nav->main[ $main_nav_item_id ] ) ) {
+                        return false;
+                }
+
+                // Unset sub_nav items for this nav item
+                if ( isset( $bp->{$component}->nav->sub[ $main_nav_item_id ] ) && is_array( $bp->{$component}->nav->sub[ $main_nav_item_id ] ) ) {
+                        foreach( (array) $bp->{$component}->nav->sub[ $main_nav_item_id ] as $sub_nav_item ) {
+                                self::remove_sub_nav_item( $component, $main_nav_item_id, $sub_nav_item['slug'] );
+                        }
+                }
+
+                $screen_function = false;
+                if ( isset( $bp->{$component}->nav->main[ $main_nav_item_id ]['screen_function'] ) ) {
+                        $screen_function = $bp->{$component}->nav->main[ $main_nav_item_id ]['screen_function'];
+                }
+
+                if ( ! empty( $screen_function ) ) {
+                        // Remove our screen hook if screen function is callable
+                        if ( is_callable( $screen_function ) ) {
+                                remove_action( 'bp_screens', $screen_function, 3 );
+                        }
+                }
+
+                unset( $bp->{$component}->nav->main[ $main_nav_item_id ] );
+                return true;
+        }
+
+        /**
+         * Remove a sub nav item for component's single item main nav
+         *
+         * @since BuddyPress (2.4.0)
+         *
+         * @param  string $component         the component id
+         * @param  string $main_nav_item_id  the main nav item id
+         * @param  string $sub_nav_item_slug the sub nav slug
+         * @return bool                      true if the sub nav was removed, false otherwise
+         */
+        public static function remove_sub_nav_item( $component ='', $main_nav_item_id = '', $sub_nav_item_slug = '' ) {
+                $bp = buddypress();
+
+                if ( empty( $component ) || empty( $main_nav_item_id ) || empty( $sub_nav_item_slug ) || ! isset( $bp->{$component}->nav->sub[ $main_nav_item_id ][ $sub_nav_item_slug ] ) ) {
+                        return false;
+                }
+
+                $screen_function = false;
+                if ( isset( $bp->{$component}->nav->sub[ $main_nav_item_id ][ $sub_nav_item_slug ]['screen_function'] ) ) {
+                        $screen_function = $bp->{$component}->nav->sub[ $main_nav_item_id ][ $sub_nav_item_slug ]['screen_function'];
+                }
+
+                if ( ! empty( $screen_function ) ) {
+                        // Remove our screen hook if screen function is callable
+                        if ( is_callable( $screen_function ) ) {
+                                remove_action( 'bp_screens', $screen_function, 3 );
+                        }
+                }
+
+                unset( $bp->{$component}->nav->sub[ $main_nav_item_id ][ $sub_nav_item_slug ] );
+                return true;
+        }
+}

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-loader.php

@@ -309 +309 @@
 
                 /** Versions **********************************************************/
 
-                $this->version    = '2.3.0';
-                $this->db_version = 9909;
+                $this->version    = '2.4.0-alpha';
+                $this->db_version = 9943;
 
                 /** Loading ***********************************************************/
 

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

@@ -1938 +1938 @@
 
                 $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', 'blog' ) ) {
+                        // Taking no risk
+                        if ( bp_blogs_blog_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-functions.php

@@ -707 +707 @@
                 if ( 'personal' == $_BP_COOKIE['bp-' . $object . '-scope'] ) {
                         $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
                         $qs[] = 'user_id=' . $user_id;
+
+                        // Blogs directory, list blogs the user is contributing to
+                        if ( 'blogs' === $object && bp_is_blogs_directory() ) {
+                                $qs[] = 'user_level=1';
+                        }
+
+                // Blogs directory, list blogs the user subscribed to
+                } elseif ( 'blogs' === $object && 'subscriptions' === $_BP_COOKIE['bp-' . $object . '-scope'] ) {
+                        $qs[] = 'user_id=' . bp_loggedin_user_id();
+                        $qs[] = 'user_level=0';
                 }
 
                 // Activity stream scope only on activity directory.

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

@@ -89 +89 @@
                                 <?php
 
                                 /**
+                                 * Fires before the listing of blogs activity type tab.
+                                 *
+                                 * @since BuddyPress (2.4.0)
+                                 */
+                                do_action( 'bp_before_activity_type_tab_blogs' ); ?>
+
+                                <?php if ( bp_is_active( 'blogs', 'blog' ) ) : ?>
+
+                                        <?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
+
+                                /**
                                  * Fires before the listing of favorites activity type tab.
                                  *
                                  * @since BuddyPress (1.2.0)

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/blogs-loop.php

@@ -48 +48 @@
         <?php while ( bp_blogs() ) : bp_the_blog(); ?>
 
                 <li <?php bp_blog_class() ?>>
-                        <div class="item-avatar">
-                                <a href="<?php bp_blog_permalink(); ?>"><?php bp_blog_avatar( 'type=thumb' ); ?></a>
-                        </div>
+                        <?php if ( ! bp_blogs_blog_disable_avatar_uploads() ) : ?>
+                                <div class="item-avatar">
+                                        <a href="<?php bp_blog_permalink(); ?>"><?php bp_blog_avatar( 'type=thumb' ); ?></a>
+                                </div>
+                        <?php endif ; ?>
 
                         <div class="item">
                                 <div class="item-title"><a href="<?php bp_blog_permalink(); ?>"><?php bp_blog_name(); ?></a></div>

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

@@ -46 +46 @@
                         <ul>
                                 <li class="selected" id="blogs-all"><a href="<?php bp_root_domain(); ?>/<?php bp_blogs_root_slug(); ?>"><?php printf( __( 'All Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count() ); ?></a></li>
 
-                                <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
+                                <?php if ( is_user_logged_in() ) : ?>
 
-                                        <li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_blogs_slug(); ?>"><?php printf( __( 'My Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
+                                        <?php if ( bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
+
+                                                <li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_blogs_slug(); ?>"><?php printf( __( 'My Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
+
+                                        <?php endif; ?>
+
+                                        <?php if ( bp_is_active( 'blogs', 'blog') && bp_blogs_total_blogs_for_user_level( bp_loggedin_user_id() ) ) : ?>
+
+                                                <li id="blogs-subscriptions"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_blogs_slug() ) . 'my-subscriptions'; ?>"><?php printf( __( 'My Subscriptions <span>%s</span>', 'buddypress' ), bp_blogs_total_blogs_for_user_level( bp_loggedin_user_id() ) ); ?></a></li>
+
+                                        <?php endif; ?>
 
                                 <?php endif; ?>
 

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

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blog single item activity
+ *
+ * @since 2.4.0
+ *
+ * @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_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.4.0
+ *
+ * @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_blog_list_admins();
+
+        do_action( 'bp_after_blog_menu_admins' ); ?>
+
+</div><!-- #item-actions -->
+
+<?php if ( bp_blogs_blog_is_avatar_uploads_enabled() ) : ?>
+
+<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 -->
+
+<?php endif ; ?>
+
+<div id="item-header-content">
+        <span class="highlight"><?php bp_blog_status(); ?></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.4.0
+ *
+ * @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 bp_blog_custom_header() ;?>
+
+        <?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_single_item_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_blog_has_access() ) {
+
+                                        // Load the appropriate front template
+                                        bp_blogs_blog_load_front_template();
+
+                                } else {
+
+                                        /**
+                                         * Fires before the display of the blog status message.
+                                         *
+                                         * @since BuddyPress (2.4.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.4.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'  );