Ticket #6026: 6026.smaller-steps.all.02.patch

phpunit.xml.dist

@@ -6 +6 @@
         convertNoticesToExceptions="true"
         convertWarningsToExceptions="true"
         >
+        <groups>
+                <exclude>
+                        <group>multisite</group>
+                </exclude>
+        </groups>
         <testsuites>
                 <testsuite>
                         <directory suffix=".php">tests/phpunit/testcases/</directory>

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

@@ -221 +221 @@
                 $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_site() ) {
+                $object      = $bp->blogs->id;
+                $primary_id  = bp_blogs_get_current_site_id();
+                $show_hidden = false;
         } else {
                 $object      = false;
                 $primary_id  = false;
@@ -232 +236 @@
                 ? $bp->loaded_components[ bp_current_action() ]
                 : bp_current_action();
 
+        // Specific case for the sites subscriptions
+        if ( 'blogs' === $scope && bp_is_user_blogs_activity() && bp_action_variable( 0 ) ) {
+                $scope = 'site_' . sanitize_key( bp_action_variable( 0 ) );
+        }
+
         // Support for permalinks on single item pages: /groups/my-group/activity/124/.
         $include = bp_is_current_action( bp_get_activity_slug() )
                 ? bp_action_variable( 0 )
@@ -3800 +3809 @@
                 if ( empty( $context ) ) {
 
                         // On member pages, default to 'member', unless this
-                        // is a user's Groups activity.
+                        // is a user's Groups or a user's Blogs activity.
                         if ( bp_is_user() ) {
+                                // Groups
                                 if ( bp_is_active( 'groups' ) && bp_is_current_action( bp_get_groups_slug() ) ) {
                                         $context = 'member_groups';
+
+                                // Sites
+                                } elseif ( bp_is_active( 'blogs' ) && bp_is_current_action( bp_get_blogs_slug() ) ) {
+                                        $context = 'member_sites';
                                 } else {
                                         $context = 'member';
                                 }
@@ -3812 +3826 @@
                         } elseif ( bp_is_active( 'groups' ) && bp_is_group() ) {
                                 $context = 'group';
 
+                        // On individual site pages, default to 'site'.
+                        } elseif ( bp_is_active( 'blogs', 'site' ) && bp_is_site() ) {
+                                $context = 'site';
+
                         // 'activity' everywhere else.
                         } else {
                                 $context = 'activity';

src/bp-activity/classes/class-bp-activity-component.php

@@ -233 +233 @@
                         );
                 }
 
+                // Additional menu if blogs is active
+                if ( is_multisite() && bp_is_active( 'blogs' ) ) {
+                        $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_blogs_activity_screen',
+                                'position'        => 60,
+                                'item_css_id'     => 'activity-blogs'
+                        );
+                }
+
                 parent::setup_nav( $main_nav, $sub_nav );
         }
 
@@ -329 +342 @@
                                         'position' => 50
                                 );
                         }
+
+                        // Blogs ?
+                        if ( is_multisite() && bp_is_active( 'blogs' ) ) {
+                                $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-blogs/bp-blogs-activity.php

@@ -25 +25 @@
                         __( 'New site created', 'buddypress' ),
                         'bp_blogs_format_activity_action_new_blog',
                         __( 'New Sites', 'buddypress' ),
-                        array( 'activity', 'member' ),
+                        array( 'activity', 'member', 'site', 'member_sites' ),
                         0
                 );
         }
@@ -77 +77 @@
         $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', 'site', 'member_sites' );
         $params->position        = 5;
 
         if ( post_type_supports( $post_type, 'comments' ) ) {
@@ -105 +105 @@
                         $params->comments_tracking->admin_filter    = __( 'New post comment posted', 'buddypress' );
                         $params->comments_tracking->format_callback = 'bp_blogs_format_activity_action_new_blog_comment';
                         $params->comments_tracking->front_filter    = __( 'Comments', 'buddypress' );
-                        $params->comments_tracking->contexts        = array( 'activity', 'member' );
+                        $params->comments_tracking->contexts        = array( 'activity', 'member', 'site', 'member_sites' );
                         $params->comments_tracking->position        = 10;
                 }
         }
@@ -1435 +1435 @@
         return $retval;
 }
 add_filter( 'bp_get_activity_action_pre_meta', 'bp_blogs_activity_comment_single_action', 10, 2 );
+
+/**
+ * Set up activity arguments to use for the 'blogs' scope.
+ *
+ * @since 2.7.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
+        $is_contributor = 1;
+        if ( 'site_subscriptions' === $filter['scope'] ) {
+                $is_contributor = 0;
+        }
+
+        $blogs = bp_blogs_get_blogs_for_user( $user_id, false, $is_contributor );
+
+        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 );
+add_filter( 'bp_activity_set_site_subscriptions_scope_args', 'bp_blogs_blog_activity_scope', 10, 2 );

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

@@ -44 +44 @@
  */
 function bp_blogs_clear_blog_object_cache( $blog_id = 0, $user_id = 0 ) {
         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' );
+                wp_cache_delete( 'bp_blogs_of_user_'                     . $user_id, 'bp' );
+                wp_cache_delete( 'bp_total_blogs_for_user_'              . $user_id, 'bp' );
+                wp_cache_delete( 'bp_total_site_subscriptions_for_user_' . $user_id, 'bp' );
         }
 
         wp_cache_delete( 'bp_total_blogs', 'bp' );

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

@@ -11 +11 @@
 defined( 'ABSPATH' ) || exit;
 
 require dirname( __FILE__ ) . '/classes/class-bp-blogs-blog.php';
+
+if ( function_exists( 'get_sites' ) ) {
+        require dirname( __FILE__ ) . '/classes/class-bp-site-query.php';
+}

src/bp-blogs/bp-blogs-filters.php

@@ -121 +121 @@
 }
 add_filter( 'bp_activity_post_pre_publish', 'bp_blogs_post_pre_publish', 10, 4 );
 add_filter( 'bp_activity_post_pre_comment', 'bp_blogs_post_pre_publish', 10, 4 );
+
+/**
+ * Use the mystery site avatar for sites.
+ *
+ * @since 2.7.0
+ *
+ * @param string $avatar Current avatar src.
+ * @param array  $params Avatar params.
+ * @return string
+ */
+function bp_blogs_default_avatar( $avatar, $params ) {
+        if ( isset( $params['object'] ) && 'blog' === $params['object'] ) {
+                $avatar = buddypress()->plugin_url . "bp-core/images/mystery-site.svg";
+        }
+
+        return $avatar;
+}
+add_filter( 'bp_core_avatar_default',       'bp_blogs_default_avatar', 10, 3 );
+add_filter( 'bp_core_avatar_default_thumb', 'bp_blogs_default_avatar', 10, 3 );
+
+/**
+ * Triggers to add filters to get_blogs_of_user
+ *
+ * @since  2.7.0
+ */
+function bp_blogs_get_blogs_of_user_add_filters() {
+        add_filter( 'pre_get_blogs_of_user', 'bp_blogs_get_sites_of_user', 10, 2 );
+        add_filter( 'get_blogs_of_user',     'bp_blogs_get_sites_of_user', 10, 2 );
+}
+
+/**
+ * Triggers to remove filters to get_blogs_of_user
+ *
+ * @since  2.7.0
+ */
+function bp_blogs_get_blogs_of_user_remove_filters() {
+        remove_filter( 'pre_get_blogs_of_user', 'bp_blogs_get_sites_of_user', 10, 2 );
+        remove_filter( 'get_blogs_of_user',     'bp_blogs_get_sites_of_user', 10, 2 );
+}

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

@@ -38 +38 @@
  *     @type int         $per_page          Default: 20.
  *     @type int         $page              Default: 1.
  *     @type bool        $update_meta_cache Whether to pre-fetch blogmeta. Default: true.
+ *     @type int         $is_contributor    Whether to get sites user is at least a contributor (1)
+ *                                          or the sites he subscribed to (0). Default: 1.
  * }
  * @return array See {@link BP_Blogs_Blog::get()}.
  */
@@ -51 +53 @@
                 '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
-                'update_meta_cache' => true      // Whether to pre-fetch blogmeta
+                'update_meta_cache' => true,     // Whether to pre-fetch blogmeta,
+                'is_contributor'    => 1,
         ), 'blogs_get_blogs' );
 
         // Get the blogs.
@@ -62 +65 @@
                 $r['user_id'],
                 $r['search_terms'],
                 $r['update_meta_cache'],
-                $r['include_blog_ids']
+                $r['include_blog_ids'],
+                $r['is_contributor']
         );
 
         // Filter and return.
@@ -303 +307 @@
  */
 function bp_blogs_record_blog( $blog_id, $user_id, $no_activity = false ) {
 
-        if ( empty( $user_id ) )
+        if ( empty( $user_id ) ) {
                 $user_id = bp_loggedin_user_id();
+        }
 
         // If blog is not recordable, do not record the activity.
-        if ( !bp_blogs_is_blog_recordable( $blog_id, $user_id ) )
+        if ( ! bp_blogs_is_blog_recordable( $blog_id, $user_id ) ) {
                 return false;
+        }
 
         $name = get_blog_option( $blog_id, 'blogname' );
         $url  = get_home_url( $blog_id );
@@ -329 +335 @@
                 $thread_depth = 1;
         }
 
-        $recorded_blog          = new BP_Blogs_Blog;
+        $recorded_blog          = new BP_Blogs_Blog( null, $user_id, $blog_id );
         $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;
+
+        // The user is a contributor.
+        if ( bp_user_can( $user_id, 'edit_posts', array( 'site_id' => $blog_id ) ) ) {
+                $recorded_blog->is_contributor = 1;
+
+        // The user is a subscriber.
+        } else {
+                $recorded_blog->is_contributor = 0;
+        }
+
+        $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 );
@@ -343 +363 @@
         bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'close_comments_days_old', $close_days_old );
         bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'thread_comments_depth', $thread_depth );
 
-        $is_private = !empty( $_POST['blog_public'] ) && (int) $_POST['blog_public'] ? false : true;
-        $is_private = !apply_filters( 'bp_is_new_blog_public', !$is_private );
+        // Get site admins
+        $site_admins = bp_blogs_get_blogmeta( $recorded_blog->blog_id, 'site_admins' );
+        if ( empty( $site_admins ) && ! is_array( $site_admins ) ) {
+                $site_admins = array();
+        }
+
+        // Eventually Add the user to site admins.
+        if ( bp_user_can( $user_id, 'manage_options', array( 'site_id' => $recorded_blog->blog_id ) ) ) {
+                if ( empty( $site_admins ) ) {
+                        bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'site_admins', array( (int) $user_id ) );
+                } else {
+                        $site_admins[] = (int) $user_id;
+                        bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'site_admins', wp_parse_id_list( $site_admins ) );
+                }
+
+        // If the user was an admin and no more is, remove it from site admins.
+        } else {
+                $was_admin = array_search( $user_id, $site_admins );
+
+                if ( false !== $was_admin ) {
+                        unset( $site_admins[ $was_admin ] );
+                        bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'site_admins', $site_admins );
+                }
+        }
+
+        $is_private = true;
+        if ( ! empty( $_POST['blog_public'] ) && (int) $_POST['blog_public'] ) {
+                $is_private = false;
+        }
+
+        $is_private = ! apply_filters( 'bp_is_new_blog_public', ! $is_private );
 
         /**
          * Fires after BuddyPress has been made aware of a new site for activity tracking.
@@ -769 +818 @@
 function bp_blogs_add_user_to_blog( $user_id, $role = false, $blog_id = 0 ) {
         global $wpdb;
 
+        /**
+         * WordPress is removing the user from the main blog just after
+         * creating it on it. So we need to do the same with blog association.
+         */
+        if ( doing_action( 'wpmu_new_user' ) ) {
+                BP_Blogs_Blog::delete_blog_for_user( get_current_site()->blog_id, $user_id );
+
+                // No need to carry on.
+                return false;
+        }
+
         // If no blog ID was passed, use the root blog ID.
         if ( empty( $blog_id ) ) {
                 $blog_id = isset( $wpdb->blogid ) ? $wpdb->blogid : bp_get_root_blog_id();
@@ -800 +860 @@
                 }
         }
 
-        // 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 ) ) {
+                return false;
+        }
+
+        // Bail if role is not in the allowed roles array.
+        if ( ! in_array( $role, bp_blogs_get_allowed_roles() ) ) {
+                $user_blog_association = new BP_Blogs_Blog( null, $user_id, $blog_id );
+
+                // If the user is associated to the blog remove him.
+                if ( ! empty( $user_blog_association->id ) ) {
+                        $user_blog_association::delete_blog_for_user( $blog_id, $user_id );
+                }
+
                 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 );
+add_action( 'wpmu_new_user', 'bp_blogs_add_user_to_blog', 10, 1 );
 
 /**
  * The allowed blog roles a member must have to be recorded into the
@@ -820 +891 @@
  * to extend the functionality of the Blogs component.
  *
  * @since 2.1.0
+ * @since 2.7.0 Add the subscriber role to the list of allowed roles if front-end subscriptions are enabled.
  *
- * @return string
+ * @return array The list of allowed blog roles.
  */
 function bp_blogs_get_allowed_roles() {
-        return apply_filters( 'bp_blogs_get_allowed_roles', array( 'contributor', 'author', 'editor', 'administrator' ) );
+        /**
+         * NB: All roles except the subcriber one will be saved into the User to blog association as contributors.
+         * (the is_contributor field of the buddypress()->blogs->table_name_blogmeta will be set to 1)
+         */
+        $allowed_roles = array( 'contributor', 'author', 'editor', 'administrator' );
+
+        // If front-end subscriptions are not disabled, add the subsciber role.
+        if ( ! bp_disable_site_subscriptions() ) {
+                array_unshift( $allowed_roles, 'subscriber' );
+        }
+
+        return apply_filters( 'bp_blogs_get_allowed_roles', $allowed_roles );
 }
 
 /**
@@ -1064 +1147 @@
  * Get the total number of blogs being tracked by BP for a specific user.
  *
  * @since 1.2.0
+ * @since 2.7.0 Now this function also gets/caches the site subscriptions count.
+ *              Adds the $is_contributor parameter.
  *
  * @param int $user_id ID of the user being queried. Default: on a user page,
  *                     the displayed user. Otherwise, the logged-in user.
  * @return int $count Total blog count for the user.
  */
-function bp_blogs_total_blogs_for_user( $user_id = 0 ) {
+function bp_blogs_total_blogs_for_user( $user_id = 0, $is_contributor = 1 ) {
         if ( empty( $user_id ) ) {
                 $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
         }
@@ -1079 +1164 @@
                 return 0;
         }
 
-        $count = wp_cache_get( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
+        $cache = 'bp_total_blogs_for_user_' . $user_id;
+        if ( 0 === $is_contributor ) {
+                $cache = 'bp_total_site_subscriptions_for_user_' . $user_id;
+        }
+
+        $count = wp_cache_get( $cache, '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' );
+                $count = BP_Blogs_Blog::total_blog_count_for_user( $user_id, $is_contributor );
+                wp_cache_set( $cache, $count, 'bp' );
         }
 
         return $count;
@@ -1126 +1216 @@
  * @see BP_Blogs_Blog::get_blogs_for_user() for a description of parameters
  *      and return values.
  *
- * @param int  $user_id     See {@BP_Blogs_Blog::get_blogs_for_user()}.
- * @param bool $show_hidden See {@BP_Blogs_Blog::get_blogs_for_user()}.
+ * @since  2.7.0 Adds the $is_contributor parameter.
+ *
+ * @param int      $user_id        See {@BP_Blogs_Blog::get_blogs_for_user()}.
+ * @param bool     $show_hidden    See {@BP_Blogs_Blog::get_blogs_for_user()}.
+ * @param int|null $is_contributor See {@BP_Blogs_Blog::get_blogs_for_user()}.
  * @return array See {@BP_Blogs_Blog::get_blogs_for_user()}.
  */
-function bp_blogs_get_blogs_for_user( $user_id, $show_hidden = false ) {
-        return BP_Blogs_Blog::get_blogs_for_user( $user_id, $show_hidden );
+function bp_blogs_get_blogs_for_user( $user_id, $show_hidden = false, $is_contributor = 1 ) {
+        return BP_Blogs_Blog::get_blogs_for_user( $user_id, $show_hidden, $is_contributor );
 }
 
 /**
@@ -1348 +1441 @@
         }
 }
 add_action( 'bp_make_ham_user', 'bp_blogs_restore_data', 10, 1 );
+
+/**
+ * Checks if we safely use sites subscriptions.
+ *
+ * @since  2.7.0
+ *
+ * @return bool True if Site subscriptions are active. False otherwise.
+ */
+function bp_blogs_is_site_subscriptions_active() {
+        return bp_is_active( 'blogs', 'site' ) && ! bp_disable_site_subscriptions();
+}
+
+/**
+ * This function is used to "replace" `get_blogs_of_user` when WordPress
+ * or BuddyPress are spamming users.
+ *
+ * This is making sure that if a subscriber is spammed, it won't spam all the sites
+ * he subscribed to!
+ *
+ * @since  2.7.0
+ *
+ * @param  array  $args {
+ *     Array of arguments. Accepts all arguments accepted by
+ *     {@link get_blogs_of_user()}. In cases function were used
+ *     to filter it before or after.
+ * }
+ * @return array  The list of sites the user can at least contribute to.
+ */
+function bp_blogs_get_sites_of_user( $args = array() ) {
+        /**
+         * Default user id is the displayed one, as it's possible
+         * to spam a user on his Profile page in BuddyPress.
+         */
+        $user_id = bp_displayed_user_id();
+
+        // Defaults to an empty array.
+        $sites   = array();
+
+        /**
+         * This function can be used to filter `pre_get_blogs_of_user`
+         * or `get_blogs_of_user`
+         */
+        if ( 2 === func_num_args() ) {
+                list( $sites, $user_id ) = func_get_args();
+
+                if ( 'get_blogs_of_user' === current_filter() ) {
+                        /**
+                         * The `pre_get_blogs_of_user` can be used as WordPress is 4.6
+                         * so the Blogs will already be the one the users is contributing
+                         * to. For WordPress < 4.6, we need remove the blogs the user has
+                         * subscribed to
+                         */
+                        if ( ! function_exists( 'get_sites' ) ) {
+                                $s_sites = BP_Blogs_Blog::get_blog_ids_for_user( $user_id, 0 );
+
+                                foreach ( $s_sites as $s_site_id ) {
+                                        unset( $sites[ $s_site_id ] );
+                                }
+                        }
+
+                        return $sites;
+                }
+        }
+
+        /**
+         * Default arguments are making sure only the sites
+         * the user is at least a contributor of will be returned.
+         */
+        $r = bp_parse_args( $args, array(
+                'user_id'          => $user_id,
+                'is_contributor'   => 1,
+                'skip_latest_post' => true,
+        ), 'get_sites_of_user' );
+
+        // The user id is required.
+        if ( empty( $r['user_id'] ) ) {
+                return $sites;
+        }
+
+        $q_sites = new BP_Site_Query( $r );
+
+        $r_sites = $q_sites->get_results();
+
+        if ( ! empty( $r_sites['blogs'] ) ) {
+                foreach ( $r_sites['blogs'] as $site ) {
+                        $sites[ $site->blog_id ] = (object) array(
+                                'userblog_id' => (int) $site->blog_id,
+                                'blogname'    => $site->name,
+                                'domain'      => $site->domain,
+                                'path'        => $site->path,
+                                'site_id'     => $site->site_id,
+                                'siteurl'     => $site->url,
+                                'archived'    => $site->archived,
+                                'mature'      => $site->mature,
+                                'spam'        => $site->spam,
+                                'deleted'     => $site->deleted,
+                        );
+                }
+        } elseif ( is_null( $sites ) ) {
+                $sites = array();
+        }
+
+        /**
+         * Filter here to edit the sites of the user.
+         *
+         * @since  2.7.0
+         *
+         * @param  array $sites An array of Site objects.
+         * @param  array $r     The merged arguments.
+         * @param  array $args  The requested arguments.
+         */
+        return apply_filters( 'bp_blogs_get_sites_of_user', $sites, $r, $args );
+}

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

@@ -72 +72 @@
 }
 add_action( 'bp_screens', 'bp_blogs_screen_index', 2 );
 
+/**
+ * Load the User's activity page.
+ *
+ * @since 2.7.0
+ */
+function bp_blogs_activity_screen() {
+        bp_update_is_item_admin( bp_current_user_can( 'bp_moderate' ), 'activity' );
+
+        /**
+         * Fires right before the loading of the "My Sites" activities screen template file.
+         *
+         * @since 2.7.0
+         */
+        do_action( 'bp_blogs_activity_screen' );
+
+        /**
+         * Filters the template to load for the "My Sites"  activities screen.
+         *
+         * @since 2.7.0
+         *
+         * @param string $template Path to the activity template to load.
+         */
+        bp_core_load_template( apply_filters( 'bp_blogs_activity_screen_template', 'members/single/home' ) );
+}
+
 /** Theme Compatibility *******************************************************/
 
 new BP_Blogs_Theme_Compat();

src/bp-blogs/bp-blogs-site.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSite
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+require dirname( __FILE__ ) . '/site/functions.php';
+require dirname( __FILE__ ) . '/site/screens.php';
+require dirname( __FILE__ ) . '/site/template.php';
+require dirname( __FILE__ ) . '/site/adminbar.php';
+require dirname( __FILE__ ) . '/site/filters.php';
+require dirname( __FILE__ ) . '/site/cache.php';
+
+if ( bp_is_active( 'activity' ) ) {
+        require dirname( __FILE__ ) . '/site/activity.php';
+}
+
+if ( bp_is_active( 'notifications' ) ) {
+        require dirname( __FILE__ ) . '/site/notifications.php';
+}
+
+if ( ! bp_disable_site_subscriptions() ) {
+        require dirname( __FILE__ ) . '/site/subscriptions.php';
+}

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

@@ -143 +143 @@
  *     @type int      $user_id          The ID of the user whose blogs should be retrieved.
  *                                      When viewing a user profile page, 'user_id' defaults to the
  *                                      ID of the displayed user. Otherwise the default is false.
+ *     @type int      $is_contributor   Whether to get sites user is at least a contributor (1)
+ *                                      or the sites he subscribed to (0). Default: 1.
  * }
  * @return bool Returns true when blogs are found, otherwise false.
  */
 function bp_has_blogs( $args = '' ) {
         global $blogs_template;
 
+        $is_contributor = 1;
+        if ( bp_is_active( 'blogs', 'site' ) && bp_is_user() && bp_is_current_action( 'my-subscriptions' ) ) {
+                $is_contributor = 0;
+        }
+
         // Check for and use search terms.
         $search_terms_default = false;
         $search_query_arg = bp_core_get_component_search_query_arg( 'blogs' );
@@ -168 +175 @@
                 'user_id'           => bp_displayed_user_id(), // Pass a user_id to limit to only blogs this user is a member of.
                 'include_blog_ids'  => false,
                 'search_terms'      => $search_terms_default,
-                'update_meta_cache' => true
+                'update_meta_cache' => true,
+                'is_contributor'    => $is_contributor,
         ), 'has_blogs' );
 
         // Set per_page to maximum if max is enforced.
@@ -177 +185 @@
         }
 
         // Get the blogs.
-        $blogs_template = new BP_Blogs_Template( $r['type'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['search_terms'], $r['page_arg'], $r['update_meta_cache'], $r['include_blog_ids'] );
+        $blogs_template = new BP_Blogs_Template( $r['type'], $r['page'], $r['per_page'], $r['max'], $r['user_id'], $r['search_terms'], $r['page_arg'], $r['update_meta_cache'], $r['include_blog_ids'], $r['is_contributor'] );
 
         /**
          * Filters whether or not there are blogs to list.
@@ -287 +295 @@
         }
 
 /**
+ * Returns the Site's avatar.
+ *
+ * @since  2.7.0
+ *
+ * @param array|string $args  {
+ *     For more information about the arguments, see
+ *     {@link bp_core_fetch_avatar()}.
+ * }
+ * @return string HTML output for the site's avatar.
+ */
+function bp_blogs_get_site_avatar( $args = array() ) {
+        $r = wp_parse_args( $args, array(
+                'item_id'    => 0,
+                'title'      => '',
+                'avatar_dir' => 'blog-avatars',
+                'object'     => 'blog',
+                'type'       => 'full',
+                'alt'        => __( 'Site Photo', 'buddypress' ),
+                'css_id'     => 0,
+                'class'      => 'avatar site-avatar',
+                'width'      => false,
+                'height'     => false,
+                'site_name'  => '',
+        ) );
+
+        if ( ! empty( $r['site_name'] ) ) {
+                $r['alt']   = sprintf( __( 'Site Photo of %s', 'buddypress' ), $r['site_name'] );
+
+                // Only replace the title if not set.
+                if ( ! $r['title'] ) {
+                        $r['title'] = $r['alt'];
+                }
+
+                unset( $r['site_name'] );
+
+        // Only set the default title if not already set.
+        } elseif ( ! $r['title'] ) {
+                $r['title'] = __( 'Site Photo', 'buddypress' );
+        }
+
+        return bp_core_fetch_avatar( $r );
+}
+
+/**
  * Output a blog's avatar.
  *
  * @see bp_get_blog_avatar() for description of arguments.
@@ -299 +351 @@
         /**
          * Get a blog's avatar.
          *
-         * At the moment, blog avatars are simply the user avatars of the blog
-         * admin. Filter 'bp_get_blog_avatar_' . $blog_id to customize.
-         *
          * @since 2.4.0 Introduced `$title` argument.
          *
          * @see bp_core_fetch_avatar() For a description of arguments and
          *      return values.
          *
          * @param array|string $args  {
-         *     Arguments are listed here with an explanation of their defaults.
          *     For more information about the arguments, see
          *     {@link bp_core_fetch_avatar()}.
-         *     @type string   $alt     Default: 'Profile picture of site author [user name]'.
-         *     @type string   $class   Default: 'avatar'.
-         *     @type string   $title   Default: 'Profile picture of site author [user name]'.
-         *     @type string   $type    Default: 'full'.
-         *     @type int|bool $width   Default: false.
-         *     @type int|bool $height  Default: false.
-         *     @type bool     $id      Currently unused.
-         *     @type bool     $no_grav Default: true.
          * }
-         * @return string User avatar string.
+         * @return string Site avatar string.
          */
         function bp_get_blog_avatar( $args = '' ) {
                 global $blogs_template;
@@ -331 +371 @@
                         return false;
                 }
 
-                $author_displayname = bp_core_get_user_displayname( $blogs_template->blog->admin_user_id );
-
                 // Parse the arguments.
                 $r = bp_parse_args( $args, array(
-                        'type'    => 'full',
-                        'width'   => false,
-                        'height'  => false,
-                        'class'   => 'avatar',
-                        'title'   => sprintf( __( 'Profile picture of site author %s', 'buddypress' ), esc_attr( $author_displayname ) ),
-                        'id'      => false,
-                        'alt'     => sprintf( __( 'Profile picture of site author %s', 'buddypress' ), esc_attr( $author_displayname ) ),
-                        'no_grav' => true,
-                ) );
+                        'item_id'   => $blogs_template->blog->blog_id,
+                        'type'      => 'thumb',
+                        'site_name' => esc_attr( bp_get_blog_name() ),
+                        'title'     => '',
+                ), 'get_blog_avatar' );
 
                 // Fetch the avatar.
-                $avatar = bp_core_fetch_avatar( array(
-                        'item_id'    => $blogs_template->blog->admin_user_id,
-                        'title'      => $r['title'],
-                        // 'avatar_dir' => 'blog-avatars',
-                        // 'object'     => 'blog',
-                        'type'       => $r['type'],
-                        'alt'        => $r['alt'],
-                        'css_id'     => $r['id'],
-                        'class'      => $r['class'],
-                        'width'      => $r['width'],
-                        'height'     => $r['height']
-                ) );
-
-                /**
-                 * In future BuddyPress versions you will be able to set the avatar for a blog.
-                 * Right now you can use a filter with the ID of the blog to change it if you wish.
-                 * By default it will return the avatar for the primary blog admin.
-                 *
-                 * This filter is deprecated as of BuddyPress 1.5 and may be removed in a future version.
-                 * Use the 'bp_get_blog_avatar' filter instead.
-                 */
-                $avatar = apply_filters( 'bp_get_blog_avatar_' . $blogs_template->blog->blog_id, $avatar );
+                $avatar = bp_blogs_get_site_avatar( $r );
 
                 /**
                  * Filters a blog's avatar.
@@ -388 +401 @@
         function bp_get_blog_permalink() {
                 global $blogs_template;
 
+                if ( is_null( $blogs_template ) ) {
+                        return;
+                }
+
                 if ( empty( $blogs_template->blog->domain ) )
                         $permalink = bp_get_root_domain() . $blogs_template->blog->path;
                 else {
@@ -900 +917 @@
         }
         add_filter( 'bp_get_total_blog_count_for_user', 'bp_core_number_format' );
 
+/**
+ * Output the total number of site subscriptions for a given user.
+ *
+ * @since  2.7.0
+ *
+ * @param int $user_id ID of the user.
+ */
+function bp_total_site_subscriptions_for_user( $user_id = 0 ) {
+        echo bp_get_total_site_subscriptions_for_user( $user_id );
+}
+        /**
+         * Return the total number of site subscriptions for a given user.
+         *
+         * @since  2.7.0
+         *
+         * @param int $user_id ID of the user.
+         * @return int Total number of site subscriptions for the user.
+         */
+        function bp_get_total_site_subscriptions_for_user( $user_id = 0 ) {
+
+                /**
+                 * Filters the total number of site subscriptions for a given user.
+                 *
+                 * @since 2.7.0
+                 *
+                 * @param int $value   Total number of site subscriptions for a given user.
+                 * @param int $user_id ID of the queried user.
+                 */
+                return apply_filters( 'bp_get_total_site_subscriptions_for_user', bp_blogs_total_blogs_for_user( $user_id, 0 ), $user_id );
+        }
+        add_filter( 'bp_get_total_site_subscriptions_for_user', 'bp_core_number_format' );
+
 
 /** Blog Registration ********************************************************/
 
@@ -1026 +1075 @@
         if ( !is_subdomain_install() )
                 echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span> <input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="63" /><br />';
         else
-                echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="63" ' . bp_get_form_field_attributes( 'blogname' ) . '/> <span class="suffix_address">.' . bp_blogs_get_subdomain_base() . '</span><br />';
+                echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="63" ' . bp_get_form_field_attributes( 'blogname' ) . '/> <span class="suffix_address">.' . bp_signup_get_subdomain_base() . '</span><br />';
 
         if ( !is_user_logged_in() ) {
                 print '(<strong>' . __( 'Your address will be ' , 'buddypress');
@@ -1161 +1210 @@
  * @param int|null     $blog_id    ID of the newly created blog.
  */
 function bp_blogs_confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = '', $blog_id = null ) {
-        switch_to_blog( $blog_id );
-        $blog_url  = set_url_scheme( home_url() );
-        $login_url = set_url_scheme( wp_login_url() );
-        restore_current_blog();
+        $site_url  = '';
+        $login_url = '';
+
+        if ( ! empty( $blog_id ) ) {
+                $site = bp_blogs_get_site( $blog_id );
+
+                if ( ! empty( $site->blog_id ) ) {
+                        $site_url  = $site->url;
+                        $login_url = $site->login_url;
+                }
+        }
 
         ?>
         <p><?php _e( 'Congratulations! You have successfully registered a new site.', 'buddypress' ) ?></p>
         <p>
-                <?php printf(
-                        '%s %s',
-                        sprintf(
-                                __( '%s is your new site.', 'buddypress' ),
-                                sprintf( '<a href="%s">%s</a>', esc_url( $blog_url ), esc_url( $blog_url ) )
-                        ),
-                        sprintf(
-                                /* translators: 1: Login URL, 2: User name */
-                                __( '<a href="%1$s">Log in</a> as "%2$s" using your existing password.', 'buddypress' ),
+                <?php
+                /* translators: 1: Blog URL, 2: Login Link, 2: User name */
+                printf( '%1$s is your new site. %2$s as "%3$s" using your existing password.',
+                        sprintf( '<a href="%s">%s</a>', esc_url( $site_url ), esc_url( $site_url ) ),
+                        sprintf( '<a href="%1$s">%2$s</a>',
                                 esc_url( $login_url ),
-                                esc_html( $user_name )
-                        )
+                                esc_html_x( 'Log in', 'Blog registered first login', 'buddypress' )
+                        ),
+                        esc_html( $user_name )
                 ); ?>
         </p>
 
-<?php
+        <?php if ( bp_blogs_is_site_avatar_uploads_enabled() && is_user_logged_in() ) :
+                $community_url = bp_blogs_get_site_community_url( $site->slug );
+                ?>
+
+                <p>
+                        <?php
+                        /* translators: 1: Community URL for the newly created site, 2: Link to the edit Site Profile photo page. */
+                        printf( __( 'Discover the %1$s of your site and take a few moments to add a %2$s.', 'buddypress' ),
+                                sprintf( '<a href="%1$s">%2$s</a>',
+                                        esc_url( $community_url ),
+                                        esc_html_x( 'community pages', 'Link text', 'buddypress' )
+                                ),
+                                sprintf( '<a href="%1$s">%2$s</a>',
+                                        esc_url( trailingslashit( $community_url . 'manage/edit-avatar' ) ),
+                                        esc_html_x( 'Site Profile Photo', 'Link text', 'buddypress' )
+                                )
+                        ); ?>
+                </p>
+
+        <?php endif;
 
         /**
          * Fires after the default successful blog registration message markup.
@@ -1483 +1555 @@
          */
         return apply_filters( 'bp_blogs_get_profile_stats', $r['output'], $r );
 }
+
+/**
+ * Displays Tabs to filter the Site's activities of the member.
+ *
+ * My sites: the activities of the sites he is at least a contributor.
+ * My Subscriptions: the activities of the sites he subscribed to.
+ *
+ * @since  2.7.0
+ *
+ * @return string HTML Output.
+ */
+function bp_blogs_member_tabs() {
+        echo join( "\n", bp_get_blogs_member_tabs() );
+}
+
+        /**
+         * Gets Tabs to filter the Site's activities of the member.
+         *
+         * @since  2.7.0
+         *
+         * @return array The list of tabs.
+         */
+        function bp_get_blogs_member_tabs() {
+                /**
+                 * Filter here to disable/edit the tabs
+                 *
+                 * @since  2.7.0
+                 *
+                 * @param array The list of User's tabs for the activity of their Sites.
+                 */
+                $tabs = apply_filters( 'bp_get_blogs_member_tabs', array(
+                        'blogs'         => __( 'My Sites', 'buddypress' ),
+                        'subscriptions' => __( 'My Subscriptions', 'buddypress' ),
+                ) );
+
+                // The site's feature or the Subscriptions one is disable, remove the tabs!
+                if ( ! bp_blogs_is_site_subscriptions_active() ) {
+                        unset( $tabs['subscriptions'] );
+
+                        // Nobody used the filter to add tabs, let's remove everything!
+                        if ( 1 === count( $tabs ) ) {
+                                unset( $tabs['blogs'] );
+                        }
+                }
+
+                $output = array();
+
+                if ( empty( $tabs ) ) {
+                        return $output;
+                }
+
+                $current_action = bp_action_variable( 0 );
+
+                foreach ( $tabs as $action => $tab ) {
+                        $selected   = '';
+                        $link_parts = array( trim( bp_displayed_user_domain(), '/' ), bp_get_activity_slug(), bp_get_blogs_slug() );
+
+                        if ( ! $current_action && 'blogs' === $action || $current_action === $action ) {
+                                $selected = ' current selected';
+                        }
+
+                        if ( 'blogs' !== $action ) {
+                                $link_parts[] = $action;
+                        }
+
+                        $output[ $action ] = sprintf( '<li class="activity-%1$s%2$s"><a href="%3$s" class="no-ajax">%4$s</a></li>',
+                                esc_attr( $action ),
+                                $selected,
+                                esc_url( trailingslashit( join( '/', $link_parts ) ) ),
+                                esc_html( $tab )
+                        );
+                }
+
+                /**
+                 * Filter here to edit the output
+                 *
+                 * @since  2.7.0
+                 *
+                 * @param array An associative array containing the links to filter the member's sites activity
+                 */
+                return apply_filters( 'bp_get_blogs_member_tabs_output', $output, $tabs );
+        }

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

@@ -44 +44 @@
         /**
          * Constructor method.
          *
-         * @param int|null $id Optional. The ID of the blog.
+         * @since  2.7.0 Add the $blog_id and $user_id parameter.
+         *
+         * @param int|null $id      Optional. The ID of the user blog association.
+         * @param int      $blog_id Optional. The ID of the blog.
+         * @param int      $user_id Optional. The ID of the user.
          */
-        public function __construct( $id = null ) {
-                if ( !empty( $id ) ) {
-                        $this->id = $id;
+        public function __construct( $id = null, $user_id = 0, $blog_id = 0 ) {
+                $this->id      = $id;
+                $this->user_id = $user_id;
+                $this->blog_id = $blog_id;
+
+                if ( $this->id || ( $this->user_id && $this->blog_id ) ) {
                         $this->populate();
                 }
         }
 
         /**
          * Populate the object with data about the specific activity item.
+         *
+         * @since  2.7.0 Add the is_contributor field.
          */
         public function populate() {
                 global $wpdb;
 
                 $bp = buddypress();
 
-                $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name} WHERE id = %d", $this->id ) );
+                if ( ! empty( $this->id ) ) {
+                        $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name} WHERE id = %d", $this->id ) );
+                } else {
+                        $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name} WHERE user_id = %d AND blog_id = %d", $this->user_id, $this->blog_id ) );
+                }
 
-                $this->user_id = $blog->user_id;
-                $this->blog_id = $blog->blog_id;
+                if ( empty( $blog ) ) {
+                        $this->id = 0;
+                        return;
+                }
+
+                $this->id             = $blog->id;
+                $this->user_id        = $blog->user_id;
+                $this->blog_id        = $blog->blog_id;
+                $this->is_contributor = $blog->is_contributor;
         }
 
         /**
          * Save the BP blog data to the database.
          *
+         * @since  2.7.0 Add the is_contributor field.
+         *
          * @return bool True on success, false on failure.
          */
         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_is_contributor_before_save', $this->is_contributor, $this->id );
 
                 /**
                  * Fires before the current blog item gets saved.
@@ -90 +113 @@
                 do_action_ref_array( 'bp_blogs_blog_before_save', array( &$this ) );
 
                 // Don't try and save if there is no user ID or blog ID set.
-                if ( !$this->user_id || !$this->blog_id )
+                if ( ! $this->user_id || ! $this->blog_id ) {
                         return false;
+                }
 
                 // Don't save if this blog has already been recorded for the user.
-                if ( !$this->id && $this->exists() )
+                if ( ! $this->id && $this->exists() ) {
                         return false;
+                }
 
                 $bp = buddypress();
 
                 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) )
+                if ( ! $wpdb->query( $sql ) ) {
                         return false;
+                }
 
                 /**
                  * Fires after the current blog item gets saved.
@@ -121 +147 @@
                  */
                 do_action_ref_array( 'bp_blogs_blog_after_save', array( &$this ) );
 
-                if ( $this->id )
+                if ( $this->id ) {
                         return $this->id;
-                else
+                } else {
                         return $wpdb->insert_id;
+                }
         }
 
         /**
@@ -146 +173 @@
         /**
          * Retrieve a set of blog-user associations.
          *
+         * @since  2.7.0 Use the BP_Site_Query class if WordPress is >= 4.6
+         *
          * @param string      $type              The order in which results should be returned.
          *                                       'active', 'alphabetical', 'newest', or 'random'.
          * @param int|bool    $limit             Optional. The maximum records to return.
@@ -159 +188 @@
          * @param bool        $update_meta_cache Whether to pre-fetch metadata for
          *                                       blogs. Default: true.
          * @param array|bool  $include_blog_ids  Array of blog IDs to include.
+         * @param int         $is_contributor    Whether to get sites user is at least a contributor (1)
+         *                                       or the sites he subscribed to (0). Default: 1.
          * @return array Multidimensional results array, structured as follows:
          *               '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 ) {
-                global $wpdb;
-
-                $bp = buddypress();
+        public static function get( $type, $limit = false, $page = false, $user_id = 0, $search_terms = false, $update_meta_cache = true, $include_blog_ids = false, $is_contributor = 1 ) {
+                // Default query vars
+                $query_vars = array(
+                        'public'                => 1,
+                        'offset'                => 0,
+                        'number'                => 20,
+                        'update_blogmeta_cache' => $update_meta_cache,
+                );
+
+                if ( bp_current_user_can( 'bp_moderate' ) || ( ! empty( $user_id ) && (int) $user_id === (int) bp_loggedin_user_id() ) ) {
+                        unset( $query_vars['public'] );
+                }
 
-                if ( !is_user_logged_in() || ( !bp_current_user_can( 'bp_moderate' ) && ( $user_id != bp_loggedin_user_id() ) ) )
-                        $hidden_sql = "AND wb.public = 1";
-                else
-                        $hidden_sql = '';
+                if ( $limit && $page ) {
+                        $query_vars = array_merge( $query_vars, array(
+                                'offset' => (int) ( ( $page - 1 ) * $limit ),
+                                'number' => (int) $limit,
+                        ) );
+                }
 
-                $pag_sql = ( $limit && $page ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
+                if ( ! empty( $user_id ) ) {
+                        $query_vars['user_id'] = (int) $user_id;
 
-                $user_sql = !empty( $user_id ) ? $wpdb->prepare( " AND b.user_id = %d", $user_id ) : '';
+                        if ( ! is_null( $is_contributor ) ) {
+                                $query_vars['is_contributor'] = (int) $is_contributor;
+                        }
+                }
 
                 switch ( $type ) {
                         case 'active': default:
-                                $order_sql = "ORDER BY bm.meta_value DESC";
+                                $query_vars = array_merge( $query_vars, array(
+                                        'orderby' => 'last_activity',
+                                        'order'   => 'DESC',
+                                ) );
                                 break;
                         case 'alphabetical':
-                                $order_sql = "ORDER BY bm_name.meta_value ASC";
+                                $query_vars =  array_merge( $query_vars, array(
+                                        'orderby' => 'name',
+                                        'order'   => 'ASC',
+                                ) );
                                 break;
                         case 'newest':
-                                $order_sql = "ORDER BY wb.registered DESC";
+                                $query_vars = array_merge( $query_vars, array(
+                                        'orderby' => 'registered',
+                                        'order'   => 'DESC',
+                                ) );
                                 break;
                         case 'random':
-                                $order_sql = "ORDER BY RAND()";
+                                $query_vars = array_merge( $query_vars, array(
+                                        'orderby' => 'RAND()',
+                                        'order'   => '',
+                                ) );
                                 break;
                 }
 
-                $include_sql = '';
                 $include_blog_ids = array_filter( wp_parse_id_list( $include_blog_ids ) );
                 if ( ! empty( $include_blog_ids ) ) {
-                        $blog_ids_sql = implode( ',', $include_blog_ids );
-                        $include_sql  = " AND b.blog_id IN ({$blog_ids_sql})";
+                        $query_vars['site__in'] = $include_blog_ids;
                 }
 
                 if ( ! empty( $search_terms ) ) {
-                        $search_terms_like = '%' . bp_esc_like( $search_terms ) . '%';
-                        $search_terms_sql  = $wpdb->prepare( 'AND (bm_name.meta_value LIKE %s OR bm_description.meta_value LIKE %s)', $search_terms_like, $search_terms_like );
+                        $query_vars['search_terms'] = bp_esc_like( $search_terms );
+                }
+
+                // Init empty results
+                $results = array( 'blogs' => array(), 'total' => 0 );
+
+                /**
+                 * If the WordPress version is at least 4.6, we will use BP_Site_Query
+                 * unless you filter 'bp_blogs_use_bp_site_query' by returning false.
+                 *
+                 * @since  2.7.0
+                 *
+                 * @param  bool $value True to use BP_Site_Query. False otherwise.
+                 */
+                if ( true === (bool) apply_filters( 'bp_blogs_use_bp_site_query', true ) && function_exists( 'get_sites' ) ) {
+                        $sites    = new BP_Site_Query( $query_vars );
+                        $results  = $sites->get_results();
+                } else {
+                        $results = self::legacy_get( $query_vars, $type );
+                }
+
+                return $results;
+        }
+
+        /**
+         * Get blogs using the legacy way.
+         *
+         * @since  2.7.0
+         *
+         * @param  array  $query_vars An array containing the query vars.
+         * @param  string $type       The sort order type.
+         * @return array Multidimensional results array, structured as follows:
+         *               'blogs' - Array of located blog objects
+         *               'total' - A count of the total blogs matching the filter params
+         */
+        public static function legacy_get( $query_vars = array(), $type = 'active' ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                $sql = array(
+                        'select'  => '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'    => "FROM {$bp->blogs->table_name} b",
+                        'join'    => array(
+                                'bm'             => "{$bp->blogs->table_name_blogmeta} bm ON (b.blog_id = bm.blog_id)",
+                                'bm_name'        => "{$bp->blogs->table_name_blogmeta} bm_name ON (b.blog_id = bm_name.blog_id)",
+                                'bm_description' => "{$bp->blogs->table_name_blogmeta} bm_description ON (b.blog_id = bm_description.blog_id)",
+                                'wb'             => "{$wpdb->blogs} wb ON (b.blog_id = wb.blog_id)",
+                                'u'              => "{$wpdb->users} u ON (b.user_id = u.ID)",
+                        ),
+                        'where'   => array(
+                                'common' => "wb.archived = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm_name.meta_key = 'name' AND bm_description.meta_key = 'description'",
+                                'active' => "bm.meta_key = 'last_activity'",
+                        ),
+                        'groupby' => 'GROUP BY b.blog_id',
+                        'orderby' => array(
+                                'last_activity' => 'ORDER BY bm.meta_value DESC',
+                                'name'          => 'ORDER BY bm_name.meta_value ASC',
+                                'registered'    => 'ORDER BY wb.registered DESC',
+                                'RAND()'        => 'ORDER BY RAND()',
+                        ),
+                        'limit'   => $wpdb->prepare( "LIMIT %d, %d", $query_vars['offset'], $query_vars['number'] ),
+                );
+
+                // Hide private blogs if needed
+                if ( ! empty( $query_vars['public'] ) ) {
+                        $sql['where']['hidden'] = 'wb.public = 1';
+                }
+
+                // Limit results to blogs the user_id is a member of.
+                if ( ! empty( $query_vars['user_id'] ) ) {
+                        $sql['where']['user_id'] = $wpdb->prepare( 'b.user_id = %d', $query_vars['user_id'] );
+
+                        // Defaults to blogs user is a least a contributor of
+                        if ( ! isset( $query_vars['is_contributor'] ) ) {
+                                $sql['where']['is_contributor'] = 'b.is_contributor = 1';
+                        } else {
+                                $sql['where']['is_contributor'] = $wpdb->prepare( 'b.is_contributor = %d', $query_vars['is_contributor'] );
+                        }
+                }
+
+                // Limit results to included sites.
+                if ( ! empty( $query_vars['site__in'] ) ) {
+                        $sql['where']['include'] = $wpdb->prepare( 'b.blog_id IN (%s)', implode( ',', $query_vars['site__in'] ) );
+                }
+
+                // Limit resultes to sites matching search terms.
+                if ( ! empty( $query_vars['search_terms'] ) ) {
+                        $search_terms_like      = '%' . $query_vars['search_terms'] . '%';
+                        $sql['where']['search'] = $wpdb->prepare( '( bm_name.meta_value LIKE %s OR bm_description.meta_value LIKE %s )', $search_terms_like, $search_terms_like );
+                }
+
+                // Eventually handle single site query.
+                $single_site = ! empty( $query_vars['single_site'] );
+
+                if ( $single_site ) {
+                        if ( ! empty( $query_vars['ID'] ) ) {
+                                $sql['where']['single_site'] = $wpdb->prepare( 'wb.blog_id = %d', $query_vars['ID'] );
+                        } elseif ( ! empty( $query_vars['domain__in'] ) ) {
+                                $sql['where']['single_site'] = $wpdb->prepare( 'wb.domain = %s', reset( $query_vars['domain__in'] ) );
+                        } else {
+                                $sql['where']['single_site'] = $wpdb->prepare( 'wb.path = %s', reset( $query_vars['path__in'] ) );
+                        }
+                }
+
+                // Set a copy for the total query
+                $total_sql = $sql;
+
+                // Set joins
+                $sql['join'] = 'LEFT JOIN ' . join( ' LEFT JOIN ', $sql['join'] );
+
+                // Set where clauses
+                $sql['where'] = 'WHERE ' . join( ' AND ', $sql['where'] );
+
+                // Set order
+                if ( ! empty( $query_vars['orderby'] ) ) {
+                        $sql_orderby    = array_intersect_key( $sql['orderby'], array( $query_vars['orderby'] => true ) );
+                        $sql['orderby'] = reset( $sql_orderby );
                 } else {
-                        $search_terms_sql = '';
-                }
-
-                $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
-                          {$bp->blogs->table_name} b
-                          LEFT JOIN {$bp->blogs->table_name_blogmeta} bm ON (b.blog_id = bm.blog_id)
-                          LEFT JOIN {$bp->blogs->table_name_blogmeta} bm_name ON (b.blog_id = bm_name.blog_id)
-                          LEFT JOIN {$bp->blogs->table_name_blogmeta} bm_description ON (b.blog_id = bm_description.blog_id)
-                          LEFT JOIN {$wpdb->base_prefix}blogs wb ON (b.blog_id = wb.blog_id)
-                          LEFT JOIN {$wpdb->users} u ON (b.user_id = u.ID)
-                        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}
-                        GROUP BY b.blog_id {$order_sql} {$pag_sql}
-                " );
-
-                $total_blogs = $wpdb->get_var( "
-                        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)
-                          LEFT JOIN {$bp->blogs->table_name_blogmeta} bm_name ON (b.blog_id = bm_name.blog_id)
-                          LEFT JOIN {$bp->blogs->table_name_blogmeta} bm_description ON (b.blog_id = bm_description.blog_id)
-                        WHERE
-                          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}
-                " );
-
-                $blog_ids = array();
-                foreach ( (array) $paged_blogs as $blog ) {
-                        $blog_ids[] = (int) $blog->blog_id;
-                }
-
-                $paged_blogs = BP_Blogs_Blog::get_blog_extras( $paged_blogs, $blog_ids, $type );
-
-                if ( $update_meta_cache ) {
+                        unset( $sql['orderby'] );
+                }
+
+                $return = array(
+                        'blogs' => $wpdb->get_results( join( ' ', $sql ) ),
+                );
+
+                // Set the total sql parts
+                if ( ! $single_site ) {
+                        $total_sql['select'] = 'SELECT COUNT(DISTINCT b.blog_id)';
+                        unset( $total_sql['join']['bm'], $total_sql['join']['u'], $total_sql['where']['active'], $total_sql['groupby'], $total_sql['orderby'], $total_sql['limit'] );
+                        $total_sql['join']  = 'LEFT JOIN ' . join( ' LEFT JOIN ', $total_sql['join'] );
+                        $total_sql['where'] = 'WHERE ' . join( ' AND ', $total_sql['where'] );
+
+                        $return['total'] = $wpdb->get_var( join( ' ', $total_sql ) );
+                }
+
+                $blog_ids           = array_map( 'intval', wp_list_pluck( $return[ 'blogs' ], 'blog_id' ) );
+                $return[ 'blogs' ]  = BP_Blogs_Blog::get_blog_extras( $return[ 'blogs' ], $blog_ids, $type, ! $single_site );
+
+                if ( ! empty( $query_vars['update_blogmeta_cache'] ) ) {
                         bp_blogs_update_meta_cache( $blog_ids );
                 }
 
-                return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
+                return $return;
         }
 
         /**
@@ -277 +428 @@
         public static function delete_blog_for_user( $blog_id, $user_id = null ) {
                 global $wpdb;
 
-                if ( !$user_id )
+                if ( ! $user_id ) {
                         $user_id = bp_loggedin_user_id();
+                }
 
                 $bp = buddypress();
 
@@ -311 +463 @@
          * blogs that have been recorded by BuddyPress, while the WP function
          * does a true query of a user's blog capabilities.
          *
-         * @param int  $user_id     Optional. ID of the user whose blogs are being
-         *                          queried. Defaults to logged-in user.
-         * @param bool $show_hidden Optional. Whether to include blogs that are not marked
-         *                          public. Defaults to true when viewing one's own profile.
+         * @since  2.7.0 Add the is_contributor parameter.
+         *
+         * @param int      $user_id        Optional. ID of the user whose blogs are being
+         *                                 queried. Defaults to logged-in user.
+         * @param bool     $show_hidden    Optional. Whether to include blogs that are not marked
+         *                                 public. Defaults to true when viewing one's own profile.
+         * @param int|null $is_contributor Optional. Type of blogs to get. Defaults to 1,
+         *                                 blogs the user is a contributor of.
          * @return array Multidimensional results array, structured as follows:
          *               'blogs' - Array of located blog objects.
          *               'total' - A count of the total blogs for the user.
          */
-        public static function get_blogs_for_user( $user_id = 0, $show_hidden = false ) {
+        public static function get_blogs_for_user( $user_id = 0, $show_hidden = false, $is_contributor = 1 ) {
                 global $wpdb;
 
                 $bp = buddypress();
 
-                if ( !$user_id )
+                if ( ! $user_id ) {
                         $user_id = bp_displayed_user_id();
+                }
+
+                $is_contributor_sql = '';
+                if ( ! is_null( $is_contributor ) ) {
+                        $is_contributor_sql = sprintf( 'AND b.is_contributor = %d', $is_contributor );
+                }
 
                 // Show logged in users their hidden blogs.
-                if ( !bp_is_my_profile() && !$show_hidden )
-                        $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id, b.id, bm1.meta_value as name, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND bm1.meta_key = 'name' AND wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ORDER BY b.blog_id", $user_id ) );
-                else
-                        $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id, b.id, bm1.meta_value as name, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND bm1.meta_key = 'name' AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ORDER BY b.blog_id", $user_id ) );
+                if ( ! bp_is_my_profile() && ! $show_hidden ) {
+                        $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id, b.id, bm1.meta_value as name, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND bm1.meta_key = 'name' AND wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d {$is_contributor_sql} ORDER BY b.blog_id", $user_id ) );
+                } else {
+                        $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id, b.id, bm1.meta_value as name, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND bm1.meta_key = 'name' AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d {$is_contributor_sql} ORDER BY b.blog_id", $user_id ) );
+                }
 
                 $total_blog_count = BP_Blogs_Blog::total_blog_count_for_user( $user_id );
 
@@ -352 +515 @@
          *
          * This method always includes hidden blogs.
          *
-         * @param int $user_id Optional. ID of the user whose blogs are being
-         *                     queried. Defaults to logged-in user.
+         * @since  2.7.0 Add the is_contributor parameter.
+         *
+         * @param int      $user_id        Optional. ID of the user whose blogs are being
+         *                                 queried. Defaults to logged-in user.
+         * @param int|null $is_contributor Optional. Type of blogs to get. Defaults to 1,
+         *                                 blogs the user is a contributor of.
          * @return int The number of blogs associated with the user.
          */
-        public static function get_blog_ids_for_user( $user_id = 0 ) {
+        public static function get_blog_ids_for_user( $user_id = 0, $is_contributor = 1 ) {
                 global $wpdb;
 
                 $bp = buddypress();
 
-                if ( !$user_id )
+                if ( ! $user_id ) {
                         $user_id = bp_displayed_user_id();
+                }
+
+                $where = array(
+                        'user_id' => $wpdb->prepare( 'user_id = %d', $user_id ),
+                );
 
-                return $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$bp->blogs->table_name} WHERE user_id = %d", $user_id ) );
+                if ( ! is_null( $is_contributor ) ) {
+                        $where['is_contributor'] = $wpdb->prepare( 'is_contributor = %d', $is_contributor );
+                }
+
+                $where = join( ' AND ', $where );
+
+                return $wpdb->get_col( "SELECT blog_id FROM {$bp->blogs->table_name} WHERE {$where}" );
         }
 
         /**
@@ -389 +567 @@
          * $user_id parameter, or when the logged-in user has the bp_moderate
          * cap.
          *
-         * @param int|null $user_id Optional. ID of the user whose blogs are being
-         *                          queried. Defaults to logged-in user.
+         * @since  2.7.0 Add the is_contributor parameter.
+         *
+         * @param int|null $user_id        Optional. ID of the user whose blogs are being
+         *                                 queried. Defaults to logged-in user.
+         * @param int|null $is_contributor Optional. Type of blogs to get. Defaults to 1,
+         *                                 blogs the user is a contributor of.
          * @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 = 1 ) {
                 global $wpdb;
 
                 $bp = buddypress();
 
-                if ( !$user_id )
+                if ( ! $user_id ) {
                         $user_id = bp_displayed_user_id();
+                }
+
+                $is_contributor_sql = '';
+                if ( ! is_null( $is_contributor ) ) {
+                        $is_contributor_sql = sprintf( 'AND b.is_contributor = %d', $is_contributor );
+                }
 
                 // 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' ) ) {
-                        return $wpdb->get_var( $wpdb->prepare( "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 wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id ) );
+                        return $wpdb->get_var( $wpdb->prepare( "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 wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d {$is_contributor_sql}", $user_id ) );
                 } else {
-                        return $wpdb->get_var( $wpdb->prepare( "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 wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id ) );
+                        return $wpdb->get_var( $wpdb->prepare( "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 wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d {$is_contributor_sql}", $user_id ) );
                 }
         }
 
@@ -453 +641 @@
          * Query will include hidden blogs if the logged-in user has the
          * 'bp_moderate' cap.
          *
-         * @param int|null $limit Optional. The maximum number of items to return.
-         *                        Default: null (no limit).
-         * @param int|null $page  Optional. The page of results to return. Default:
-         *                        null (no limit).
+         * @param int|null $limit           Optional. The maximum number of items to return.
+         *                                  Default: null (no limit).
+         * @param int|null $page            Optional. The page of results to return. Default:
+         *                                  null (no limit).
+         * @param int|null $is_contributor  Optional. The type of blogs to return. Default:
+         *                                  1 (blogs the user is a contributor of).
          * @return array Multidimensional results array, structured as follows:
          *               'blogs' - Array of located blog objects.
          *               'total' - A count of the total blogs.
          */
-        public static function get_all( $limit = null, $page = null ) {
+        public static function get_all( $limit = null, $page = null, $is_contributor = 1 ) {
                 global $wpdb;
 
                 $bp = buddypress();
 
-                $hidden_sql = !bp_current_user_can( 'bp_moderate' ) ? "AND wb.public = 1" : '';
+                $is_contributor_sql = '';
+                if ( ! is_null( $is_contributor ) ) {
+                        $is_contributor_sql = sprintf( 'AND b.is_contributor = %d', $is_contributor );
+                }
+
+                $hidden_sql         = "AND wb.public = 1";
+                if ( bp_current_user_can( 'bp_moderate' ) ) {
+                        $hidden_sql     = '';
+                }
+
                 $pag_sql    = ( $limit && $page ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
 
-                $paged_blogs = $wpdb->get_results( "SELECT 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 wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$hidden_sql} {$pag_sql}" );
-                $total_blogs = $wpdb->get_var( "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 wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$hidden_sql}" );
+                $paged_blogs = $wpdb->get_results( "SELECT 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 wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$hidden_sql} {$is_contributor_sql} {$pag_sql}" );
+                $total_blogs = $wpdb->get_var( "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 wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$hidden_sql} {$is_contributor_sql}" );
 
                 return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
         }
@@ -495 +694 @@
 
                 $bp = buddypress();
 
-                $letter_like = '%' . bp_esc_like( $letter ) . '%';
+                $letter_like = bp_esc_like( $letter ) . '%';
                 $letter_sql  = $wpdb->prepare( 'bm.meta_value LIKE %s', $letter_like );
 
                 $hidden_sql = '';
@@ -526 +725 @@
          * @param string|bool $type        Not currently used. Default: false.
          * @return array $paged_blogs The located blogs array, with the extras added.
          */
-        public static function get_blog_extras( &$paged_blogs, &$blog_ids, $type = false ) {
+        public static function get_blog_extras( &$paged_blogs, &$blog_ids, $type = false, $get_latest_post = true ) {
                 global $wpdb;
 
                 $bp = buddypress();
 
-                if ( empty( $blog_ids ) )
+                if ( empty( $blog_ids ) ) {
                         return $paged_blogs;
+                }
 
                 $blog_ids = implode( ',', wp_parse_id_list( $blog_ids ) );
 
-                for ( $i = 0, $count = count( $paged_blogs ); $i < $count; ++$i ) {
-                        $blog_prefix = $wpdb->get_blog_prefix( $paged_blogs[$i]->blog_id );
-                        $paged_blogs[$i]->latest_post = $wpdb->get_row( "SELECT ID, post_content, post_title, post_excerpt, guid FROM {$blog_prefix}posts WHERE post_status = 'publish' AND post_type = 'post' AND id != 1 ORDER BY id DESC LIMIT 1" );
-                        $images = array();
-
-                        // Add URLs to any Featured Image this post might have.
-                        if ( ! empty( $paged_blogs[$i]->latest_post ) && has_post_thumbnail( $paged_blogs[$i]->latest_post->ID ) ) {
-
-                                // Grab 4 sizes of the image. Thumbnail.
-                                $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'thumbnail', false );
-                                if ( ! empty( $image ) )
-                                        $images['thumbnail'] = $image[0];
-
-                                // Medium.
-                                $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'medium', false );
-                                if ( ! empty( $image ) )
-                                        $images['medium'] = $image[0];
-
-                                // Large.
-                                $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'large', false );
-                                if ( ! empty( $image ) )
-                                        $images['large'] = $image[0];
-
-                                // Post thumbnail.
-                                $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'post-thumbnail', false );
-                                if ( ! empty( $image ) )
-                                        $images['post-thumbnail'] = $image[0];
-
-                                // Add the images to the latest_post object.
-                                $paged_blogs[$i]->latest_post->images = $images;
+                // Only get latest post in loops.
+                if ( $get_latest_post ) {
+
+                        for ( $i = 0, $count = count( $paged_blogs ); $i < $count; ++$i ) {
+                                $blog_prefix = $wpdb->get_blog_prefix( $paged_blogs[$i]->blog_id );
+                                $paged_blogs[$i]->latest_post = $wpdb->get_row( "SELECT ID, post_content, post_title, post_excerpt, guid FROM {$blog_prefix}posts WHERE post_status = 'publish' AND post_type = 'post' AND id != 1 ORDER BY id DESC LIMIT 1" );
+                                $images = array();
+
+                                // Add URLs to any Featured Image this post might have.
+                                if ( ! empty( $paged_blogs[$i]->latest_post ) && has_post_thumbnail( $paged_blogs[$i]->latest_post->ID ) ) {
+
+                                        // Grab 4 sizes of the image. Thumbnail.
+                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'thumbnail', false );
+                                        if ( ! empty( $image ) )
+                                                $images['thumbnail'] = $image[0];
+
+                                        // Medium.
+                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'medium', false );
+                                        if ( ! empty( $image ) )
+                                                $images['medium'] = $image[0];
+
+                                        // Large.
+                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'large', false );
+                                        if ( ! empty( $image ) )
+                                                $images['large'] = $image[0];
+
+                                        // Post thumbnail.
+                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'post-thumbnail', false );
+                                        if ( ! empty( $image ) )
+                                                $images['post-thumbnail'] = $image[0];
+
+                                        // Add the images to the latest_post object.
+                                        $paged_blogs[$i]->latest_post->images = $images;
+                                }
                         }
                 }
 
@@ -622 +826 @@
 
                 return $user_blog;
         }
+
+        /**
+         * List the User ids who are contributors or subscribers of the site.
+         * If the detail parameter is set to true, this list will be organized
+         * according to the contribution "power" of users.
+         *
+         * @since  2.7.0
+         *
+         * @param  int         $blog_id         The blog ID to get users for.
+         * @param  int|null    $is_contributor  Get only contributors (1) or subscribers (0).
+         * @param  string|null $order           Null for no order, DESC or ASC.
+         * @return array                 The list of users of the blog
+         */
+        public static function get_site_user_ids( $blog_id, $is_contributor = null, $order = null ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                $sql = array(
+                        'select' => "SELECT user_id, is_contributor FROM {$bp->blogs->table_name}",
+                        'where'  => array(
+                                'blog_id' => $wpdb->prepare( 'blog_id = %d', $blog_id ),
+                        ),
+                );
+
+                if ( ! is_null( $is_contributor ) ) {
+                        $sql['where']['is_contributor'] = $wpdb->prepare( 'is_contributor = %d', $is_contributor );
+                }
+
+                if ( 'DESC' === $order || 'ASC' === $order ) {
+                        $sql['order'] = sprintf( 'ORDER BY id %s', $order );
+                }
+
+                $sql['where'] = 'WHERE ' . join( ' AND ', $sql['where'] );
+                $query        = join( ' ', $sql );
+
+                return $wpdb->get_results( $query, OBJECT_K );
+        }
+
+        /**
+         * Returns the number of recorded Users for a blog
+         *
+         * @since  2.7.0
+         *
+         * @param  int $blog_id The blog ID to get the users count for.
+         * @return int          The number of users.
+         */
+        public static function get_site_users_count( $blog_id ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                $users_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( user_id ) FROM {$bp->blogs->table_name} WHERE blog_id = %d", $blog_id ) );
+
+                if ( empty( $users_count ) ) {
+                        return false;
+                }
+
+                return (int) $users_count;
+        }
 }

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

@@ -31 +31 @@
                         buddypress()->plugin_dir,
                         array(
                                 'adminbar_myaccount_order' => 30,
-                                'search_query_arg' => 'sites_search',
+                                'search_query_arg'         => 'sites_search',
+                                'features'                 => array( 'site' ),
                         )
                 );
         }
@@ -106 +107 @@
                                 add_post_type_support( $post_type, 'buddypress-activity' );
                         }
                 }
+
+                /** Single Site globals *******************************************************/
+
+                if ( is_multisite() && bp_is_blogs_component() && bp_current_action() && bp_is_active( $this->id, 'site' ) ) {
+                        // Initialize a global placeholder for the site.
+                        $this->site           = new stdClass;
+                        $this->site->settings = array();
+
+                        // Set the current Site object
+                        if ( bp_is_current_action( bp_blogs_get_root_site_slug() ) ) {
+                                $this->current_site = bp_blogs_get_site( bp_get_root_blog_id() );
+                        } else {
+                                $this->current_site = bp_blogs_get_site( bp_current_action() );
+                        }
+
+                        if ( empty( $this->current_site->blog_id ) ) {
+                                $this->current_site = 0;
+                                return;
+                        }
+
+                        // It's a single Site
+                        $bp->is_single_item  = true;
+                        $bp->current_item    = $this->current_site->slug;
+                        $bp->current_action  = bp_action_variable( 0 );
+                        array_shift( $bp->action_variables );
+
+                        if ( is_super_admin() || $this->current_site->is_admin ) {
+                                bp_update_is_item_admin( true, $bp->blogs->id );
+                        }
+
+                        // By Default grant access
+                        $this->current_site->user_has_access = true;
+
+                        // If the site is not public, non members can't access
+                        if ( ! $this->current_site->public && ! $this->current_site->is_member && ! bp_is_item_admin() ) {
+                                $this->current_site->user_has_access = false;
+                        }
+
+                        // Check once if the current site has a custom front template
+                        $this->current_site->front_template = bp_blogs_get_site_front_template( $this->current_site );
+
+                        // Initialize the nav for the current site.
+                        $this->nav = new BP_Core_Nav( $this->current_site->blog_id );
+
+                        // Add the id property, so that it's easier for the cover image
+                        $this->current_site->id = (int) $this->current_site->blog_id;
+
+                        /**
+                         * Hook here to add your custom globals for the site feature.
+                         * Use it to add specific settings using bp_blogs_register_site_settings()
+                         *
+                         * @since  2.7.0
+                         *
+                         * @param  int $value The current site id.
+                         */
+                        do_action( "bp_{$this->id}_setup_site_globals", $this->current_site->blog_id );
+
+                // Set current_site to 0 to prevent debug errors.
+                } else {
+                        $this->current_site = 0;
+                }
+        }
+
+        /**
+         * Set up canonical stack for this component.
+         *
+         * @since 2.7.0
+         */
+        public function setup_canonical_stack() {
+                $bp = buddypress();
+
+                if ( ! bp_is_blogs_component() ) {
+                        return;
+                }
+
+                if ( empty( $this->current_site ) ) {
+                        return;
+                }
+
+                if ( ! bp_current_action() ) {
+                        $bp->current_action = 'home';
+                }
+
+                // Prepare for a redirect to the canonical URL
+                $bp->canonical_stack['base_url'] = bp_blogs_get_site_community_url( $this->current_site->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'] );
+                }
         }
 
         /**
@@ -137 +240 @@
 
                 if ( is_multisite() ) {
                         $includes[] = 'widgets';
+
+                        // Conditional includes
+                        if ( bp_is_active( $this->id, 'site' ) ) {
+                                $includes[] = 'site';
+                        }
                 }
 
                 // Include the files.
@@ -144 +252 @@
         }
 
         /**
-         * Set up component navigation for bp-blogs.
+         * Set up component navigation for bp-blogs and for the Site's feature.
          *
          * @see BP_Component::setup_nav() for a description of arguments.
          *
@@ -170 +278 @@
                 } 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(
-                        /* translators: %s: Site count for the current user */
-                        __( 'Sites %s', 'buddypress' ),
-                        sprintf(
-                                '<span class="%s">%s</span>',
-                                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(
+                                /* translators: %s: Site count for the current user */
+                                __( 'Sites %s', 'buddypress' ),
+                                sprintf(
+                                        '<span class="%s">%s</span>',
+                                        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_blogs_is_site_subscriptions_active() ) {
+                                $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 Site navigation
+                if ( bp_is_blogs_component() && bp_is_single_item() ) {
+
+                        /** Set the Primary Navigation of the Site ************************************/
+
+                        /**
+                         * Use this filter to add your public primary nav items.
+                         *
+                         * NB: Make sure to use a position greater than 20 for your
+                         * custom items.
+                         *
+                         * @since  2.7.0
+                         *
+                         * @param array  $site_main_nav The list of public nav items.
+                         * @param object $value         The current site displayed.
+                         */
+                        $site_main_nav = apply_filters( 'bp_blogs_setup_site_public_primary_nav', array( 'site_home' => array(
+                                        'name'                => __( 'Home', 'buddypress' ),
+                                        'slug'                => 'home',
+                                        'position'            => 0,
+                                        'screen_function'     => 'bp_blogs_screen_site_home',
+                                        'default_subnav_slug' => false,
+                                ),
+                        ), $this->current_site );
+
+                        if ( bp_blogs_current_site_has_access() ) {
+                                // Fix the scope for Ajax filtering when members is the home page
+                                $site_main_nav['site_home']['item_css_id'] = 'members';
+
+                                if ( $this->current_site->front_template || ( bp_is_active( 'activity' ) && bp_blogs_current_site_is_public() ) ) {
+                                        /**
+                                         * Only add the members nav if it's not the home's nav
+                                         */
+                                        $site_main_nav[] = array(
+                                                'name'                => sprintf( _x( 'Members <span>%s</span>', 'Single Site members screen nav', 'buddypress' ), $this->current_site->total_users ),
+                                                'slug'                => 'members',
+                                                'position'            => 20,
+                                                'screen_function'     => 'bp_blogs_screen_site_home',
+                                                'default_subnav_slug' => false,
+                                        );
+
+                                        // Default scope is home
+                                        $site_main_nav['site_home']['item_css_id'] = 'home';
+
+                                        /**
+                                         * If the theme is using a custom front, create
+                                         * an activity nav if the site is public
+                                         */
+                                        if ( $this->current_site->front_template && bp_is_active( 'activity' ) && bp_blogs_current_site_is_public() ) {
+                                                $site_main_nav[] = array(
+                                                        'name'                => _x( 'Activity', 'Single Site activity screen nav', 'buddypress' ),
+                                                        'slug'                => 'activity',
+                                                        'position'            => 10,
+                                                        'screen_function'     => 'bp_blogs_screen_site_home',
+                                                        'default_subnav_slug' => false,
+                                                );
+                                        }
+                                }
+
+                                // Manage Main nav
+                                $site_main_nav[] = array(
+                                        'name'                => _x( 'Manage', 'Single Blog manage screen nav', 'buddypress' ),
+                                        'slug'                => 'manage',
+                                        'position'            => 1000,
+                                        'screen_function'     => 'bp_blogs_screen_site_manage',
+                                        'default_subnav_slug' => 'settings',
+                                        'site_admin_only'     => ! bp_is_item_admin(),
+                                );
+
+                                /**
+                                 * Use this filter to add your restricted primary nav items.
+                                 *
+                                 * NB: Make sure to use a position greater than 20 for your
+                                 * custom items.
+                                 *
+                                 * @since  2.7.0
+                                 *
+                                 * @param array  $site_main_nav The list of restricted nav items.
+                                 * @param object $value         The current site displayed.
+                                 */
+                                $site_main_nav = apply_filters( 'bp_blogs_setup_site_restricted_primary_nav', $site_main_nav, $this->current_site );
+                        }
+
+                        // Loop in nav items to create the primary nav.
+                        foreach ( $site_main_nav as $nav_item ) {
+                                bp_core_new_nav_item( $nav_item, 'blogs' );
+                        }
+
+                        /** Set the secondary navigation of the Site **********************************/
+
+                        $site_link = bp_blogs_get_site_community_url( $this->current_site->slug );
+
+                        /**
+                         * General settings
+                         *
+                         * Edit the preferences for the current site.
+                         * Access is restricted to The site admins.
+                         */
+                        bp_core_new_subnav_item( array(
+                                'name'              => _x( 'Settings', 'Single Blog setting screen', 'buddypress' ),
+                                'slug'              => 'settings',
+                                'parent_url'        => trailingslashit( $site_link . 'manage' ),
+                                'parent_slug'       => 'manage',
+                                'screen_function'   => 'bp_blogs_screen_site_manage',
+                                'position'          => 0,
+                                'user_has_access'   => bp_is_item_admin(),
+                                'no_access_url'     => $site_link,
+                                'show_in_admin_bar' => true,
+                        ), 'blogs' );
+
+                        /**
+                         * Site's Profile Photo
+                         *
+                         * Edit the logo for the current site.
+                         * Access is restricted to the site admins.
+                         */
+                        if ( bp_blogs_is_site_avatar_uploads_enabled() ) {
+                                bp_core_new_subnav_item( array(
+                                        'name'              => _x( 'Profile Photo', 'Single Site edit photo screen', 'buddypress' ),
+                                        'slug'              => 'edit-avatar',
+                                        'parent_url'        => trailingslashit( $site_link . 'manage' ),
+                                        'parent_slug'       => 'manage',
+                                        'screen_function'   => 'bp_blogs_screen_site_manage',
+                                        'position'          => 10,
+                                        'user_has_access'   => bp_is_item_admin(),
+                                        'no_access_url'     => $site_link,
+                                        'show_in_admin_bar' => true,
+                                ), 'blogs' );
+                        }
+
+                        /**
+                         * @todo Site's Cover Image
+                         *
+                         * Edit the cover image for the current site.
+                         * Access is restricted to the site admins.
+                         */
+                        if ( bp_site_use_cover_image_header() ) {
+                                bp_core_new_subnav_item( array(
+                                        'name'              => _x( 'Cover Image', 'Single Blog setting screen', 'buddypress' ),
+                                        'slug'              => 'edit-cover-image',
+                                        'parent_url'        => trailingslashit( $site_link . 'manage' ),
+                                        'parent_slug'       => 'manage',
+                                        'screen_function'   => 'bp_blogs_screen_site_manage',
+                                        'position'          => 20,
+                                        'user_has_access'   => bp_is_item_admin(),
+                                        'no_access_url'     => $site_link,
+                                        'show_in_admin_bar' => true,
+                                ), 'blogs' );
+                        }
+
+                        if ( bp_blogs_current_site_can_subscribe() ) {
+                                /**
+                                 * Manage members.
+                                 *
+                                 * Eventually remove subscriptions.
+                                 */
+                                bp_core_new_subnav_item( array(
+                                        'name'              => _x( 'Members', 'Single Site manage members screen', 'buddypress' ),
+                                        'slug'              => 'members',
+                                        'parent_url'        => trailingslashit( $site_link . 'manage' ),
+                                        'parent_slug'       => 'manage',
+                                        'screen_function'   => 'bp_blogs_screen_site_manage',
+                                        'position'          => 30,
+                                        'user_has_access'   => bp_is_item_admin(),
+                                        'no_access_url'     => $site_link,
+                                        'show_in_admin_bar' => true,
+                                ), 'blogs' );
+                        }
+                }
+
+                /**
+                 * Use this action to add your custom secondary nav items.
+                 *
+                 * NB: Make sure to use the parent slug of the primary nav item
+                 * you defined filtering `bp_blogs_setup_site_public_primary_nav`
+                 * or `bp_blogs_setup_site_restricted_primary_nav`.
+                 *
+                 * @since  2.7.0
+                 *
+                 * @param array  $site_main_nav The list of restricted nav items.
+                 * @param object $value         The current site displayed.
+                 */
+                do_action( 'bp_blogs_setup_site_secondary_nav', $this->current_site );
         }
 
         /**
@@ -255 +560 @@
                                 'position' => 10
                         );
 
+                        if ( bp_blogs_is_site_subscriptions_active() ) {
+                                $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(
@@ -286 +600 @@
 
                         // If we are not viewing the logged in user, set up the current
                         // users avatar and name.
-                        } else {
+                        } elseif ( ! bp_is_my_profile() && ! bp_is_single_item() ) {
                                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(
                                         'item_id' => bp_displayed_user_id(),
                                         'type'    => 'thumb',
                                         'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
                                 ) );
                                 $bp->bp_options_title = bp_get_displayed_user_fullname();
+
+                        // Viewing a single site.
+                        } elseif ( bp_is_single_item() ) {
+                                $bp->bp_options_title  = $this->current_site->name;
+                                $bp->bp_options_avatar = bp_core_fetch_avatar( array(
+                                        'item_id'    => $this->current_site->blog_id,
+                                        'object'     => 'blogs',
+                                        'type'       => 'thumb',
+                                        'avatar_dir' => 'blog-avatars',
+                                        'alt'        => __( 'Site Profile 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 Profile Photo', 'buddypress' ) . '" class="avatar" />';
+                                }
                         }
                 }
 
@@ -305 +634 @@
          * @since 2.2.0
          */
         public function setup_cache_groups() {
+                $cache_group = array( 'blog_meta' );
+
+                if ( bp_is_active( 'blogs', 'site' ) ) {
+                        $cache_group = array_merge( $cache_group, array(
+                                'bp_site',
+                                'bp_site_slugs',
+                        ) );
+                }
 
                 // Global groups.
-                wp_cache_add_global_groups( array(
-                        'blog_meta'
-                ) );
+                wp_cache_add_global_groups( $cache_group );
 
                 parent::setup_cache_groups();
         }

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

@@ -96 +96 @@
          * @param bool       $update_meta_cache Whether to pre-fetch metadata for
          *                                      queried blogs.
          * @param array|bool $include_blog_ids  Array of blog IDs to include.
+         * @param int        $is_contributor    Whether to get sites user is at least a contributor (1)
+         *                                      or the sites he subscribed to (0). Default: 1.
          */
-        public function __construct( $type, $page, $per_page, $max, $user_id, $search_terms, $page_arg = 'bpage', $update_meta_cache = true, $include_blog_ids = false ) {
+        public function __construct( $type, $page, $per_page, $max, $user_id, $search_terms, $page_arg = 'bpage', $update_meta_cache = true, $include_blog_ids = false, $is_contributor = 1 ) {
 
                 $this->pag_arg  = sanitize_key( $page_arg );
                 $this->pag_page = bp_sanitize_pagination_arg( $this->pag_arg, $page     );
@@ -117 +119 @@
                                 'search_terms'      => $search_terms,
                                 'update_meta_cache' => $update_meta_cache,
                                 'include_blog_ids'  => $include_blog_ids,
+                                'is_contributor'    => $is_contributor,
                         ) );
                 }
 

src/bp-blogs/classes/class-bp-blogs-theme-compat.php

@@ -32 +32 @@
         /**
          * Are we looking at something that needs Blogs theme compatibility?
          *
-         * @since 1.7.0
+         * @since  1.7.0
+         * @since  2.7.0 Add the site's feature theme compat.
          */
         public function is_blogs() {
 
                 // Bail if not looking at a group.
-                if ( ! bp_is_blogs_component() )
+                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' );
 
                         /**
@@ -61 +64 @@
                         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'    ) );
+
+                // Single site
+                } 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'    ) );
                 }
         }
 
@@ -198 +207 @@
         public function create_content() {
                 return bp_buffer_template_part( 'blogs/create', null, false );
         }
+
+        /** Single ************************************************************/
+
+        /**
+         * Add custom template hierarchy to theme compat for single site pages.
+         *
+         * This is to mirror how WordPress has
+         * {@link https://codex.wordpress.org/Template_Hierarchy template hierarchy}.
+         *
+         * @since 2.7.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
+                $site = bp_blogs_get_current_site();
+
+                /**
+                 * Filters the single site pages template hierarchy based on priority.
+                 *
+                 * @since 2.7.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( $site->blog_id )      . '.php',
+                        'blogs/single/index-slug-'   . sanitize_file_name( $site->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 2.7.0
+         */
+        public function single_dummy_post() {
+                bp_theme_compat_reset_post( array(
+                        'ID'             => 0,
+                        'post_title'     => bp_blogs_get_current_site_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 2.7.0
+         */
+        public function single_content() {
+                return bp_buffer_template_part( 'blogs/single/home', null, false );
+        }
 }

src/bp-blogs/classes/class-bp-site-query.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Classes.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsClasses
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * BuddyPress class used for querying sites.
+ *
+ * @since 2.7.0
+ *
+ * @see BP_Site_Query::__construct() for accepted arguments.
+ */
+class BP_Site_Query extends WP_Site_Query {
+
+        /**
+         * Get sites of a network according to a given request.
+         *
+         * @since  2.7.0
+         *
+         * @access public
+         *
+         * @param string|array $query {
+         *     Optional. Array or query string of site query parameters. Default empty.
+         *     @see WP_Site_Query::__construct() for WordPress arguments.
+         *     Below are arguments specific to BuddyPress.
+         *
+         *     @type int         $user_id        Optional. ID of the user whose blogs are being
+         *                                       retrieved. Default: 0.
+         *     @type string|bool $search_terms   Optional. Search by text stored in
+         *                                       blogmeta (such as the blog name). Default: false.
+         * }
+         */
+        public function __construct( $query = '' ) {
+                // Set filters.
+                $this->set_filters();
+
+                // Set defaults query vars.
+                parent::__construct();
+
+                // Set BuddyPress specific query vars.
+                $this->set_bp_query( $query );
+
+                // If sites are not already set, run the query
+                if ( ! isset( $this->sites ) ) {
+                        // Get the matching sites
+                        $this->get_sites();
+
+                        // Get extra data for each found sites.
+                        $this->get_site_extras();
+                }
+        }
+
+        /**
+         * Set custom filters to edit WordPress query
+         *
+         * @since  2.7.0
+         *
+         * @access private
+         */
+        private function set_filters() {
+                add_filter( 'sites_clauses', array( $this, 'edit_query' ), 10, 1 );
+        }
+
+        /**
+         * Get sites of a network according to a given request.
+         *
+         * @since  2.7.0
+         *
+         * @access private
+         *
+         * @param string|array $query Array or string of BP_Site_Query arguments. See BP_Site_Query::__construct().
+         */
+        private function set_bp_query( $query = '' ) {
+                $this->query_vars = wp_parse_args( $query, array(
+                        'offset'   => 0,
+                        'number'   => 20,
+                        /**
+                         * Make sure to not display
+                         * the following site status:
+                         */
+                        'mature'   => 0,
+                        'spam'     => 0,
+                        'archived' => 0,
+                        'deleted'  => 0,
+                ) );
+
+                // Get total for loop queries.
+                if ( empty( $this->query_vars['single_site'] ) ) {
+                        $this->query_vars['no_found_rows'] = false;
+                }
+
+                /**
+                 * Use the WP_Site_Query 'site__in' argument to limit fetched sites to the ones the user
+                 * is a contributor or a subscriber of.
+                 */
+                if ( ! empty( $this->query_vars['user_id'] ) ) {
+                        $is_contributor = null;
+
+                        // This way `null` can be used to get all contribution types.
+                        if ( isset( $this->query_vars['is_contributor'] ) && ! is_null( $this->query_vars['is_contributor'] ) ) {
+                                $is_contributor = (int) $this->query_vars['is_contributor'];
+                        }
+
+                        $user_sites = BP_Blogs_Blog::get_blog_ids_for_user( $this->query_vars['user_id'], $is_contributor );
+
+                        if ( empty( $user_sites ) ) {
+                                $this->sites       = array();
+                                $this->found_sites = 0;
+                                return;
+                        }
+
+                        if ( ! empty( $this->query_vars['site__in'] ) ) {
+                                $intersect = array_intersect( $user_sites, $this->query_vars['site__in'] );
+
+                                if ( ! empty( $intersect ) ) {
+                                        $user_sites = $intersect;
+                                }
+                        }
+
+                        $this->query_vars['site__in'] = $user_sites;
+                }
+
+                /**
+                 * In case of a search, build a Meta Query to look inside 'name' and
+                 * 'description' metadatas.
+                 */
+                if ( ! empty( $this->query_vars['search_terms'] ) ) {
+                        $this->query_vars['meta_query'] = array(
+                                'relation' => 'OR',
+                                array(
+                                        'key'     => 'name',
+                                        'value'   => $this->query_vars['search_terms'],
+                                        'compare' => 'LIKE',
+                                ),
+                                array(
+                                        'key'     => 'description',
+                                        'value'   => $this->query_vars['search_terms'],
+                                        'compare' => 'LIKE',
+                                ),
+                        );
+                }
+        }
+
+        /**
+         * Only get blogmeta without caching results.
+         *
+         * @since  2.7.0
+         *
+         * @access private
+         *
+         * @param  int   $site_id The site ID
+         * @return array          The list of blogmeta for the requested site.
+         */
+        private function get_blogmeta_no_cache( $site_id = 0 ) {
+                global $wpdb;
+                $return = array();
+
+                if ( empty( $site_id ) ) {
+                        return $return;
+                }
+
+                $blogmeta_table = buddypress()->blogs->table_name_blogmeta;
+
+                $metas = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM {$blogmeta_table} WHERE blog_id = %d", $site_id ), ARRAY_A );
+
+                foreach( $metas as $row ) {
+                        if ( ! isset( $return[ $row['meta_key'] ] ) ) {
+                                $return[ $row['meta_key'] ] = array( $row['meta_value'] );
+                        } else {
+                                $return[ $row['meta_key'] ][] = $row['meta_value'];
+                        }
+                }
+
+                return $return;
+        }
+
+        /**
+         * Loop in found sites to attach metadatas.
+         *
+         * @since  2.7.0
+         *
+         * @access private
+         */
+        private function get_site_extras() {
+                if ( is_null( $this->sites ) ) {
+                        return;
+                }
+
+                $site_ids = $this->get_ids();
+
+                // It can happen when the main requests is only fetching site ids.
+                if ( empty( $site_ids ) ) {
+                        return;
+                }
+
+                $update_meta_cache = false;
+                if ( ! empty( $this->query_vars['update_blogmeta_cache'] ) ) {
+                        $update_meta_cache = true;
+                }
+
+                $sites = array();
+
+                foreach ( $this->sites as $ak => $site ) {
+
+                        if ( $update_meta_cache ) {
+                                $site_metas = bp_blogs_get_blogmeta( $site->blog_id );
+                        } else {
+                                $site_metas = $this->get_blogmeta_no_cache( $site->blog_id );
+                        }
+
+                        foreach ( $site_metas as $key => $meta ) {
+                                // Don't fetch private blogmeta
+                                if ( is_protected_meta( $key ) ) {
+                                        continue;
+                                }
+
+                                if ( 1 === count( $meta ) ) {
+                                        $site->{$key} = maybe_unserialize( $meta[0] );
+                                } else {
+                                        $site->{$key} = array_map( 'maybe_unserialize', $meta );
+                                }
+
+                                // Get the first admin to make sure the user avatar will be used.
+                                if ( 'site_admins' === $key ) {
+                                        $site->admin_user_id = reset( $site->{$key} );
+                                }
+
+                                /**
+                                 * Attach latest post data, if not querying for a single site
+                                 * & if the query is not including the skip_latest_post flag
+                                 */
+                                if ( empty( $this->query_vars['single_site'] ) && empty( $this->query_vars['skip_latest_post'] ) ) {
+                                        $site = $this->get_latest_post( $site );
+                                }
+                        }
+
+                        // Reindex for easier matching.
+                        $sites[ $site->blog_id ] = $site;
+                }
+
+                $this->sites = $sites;
+        }
+
+        /**
+         * Attach the latest publish post to each site.
+         *
+         * @since  2.7.0
+         *
+         * @param  WP_Site $site The site object.
+         * @return WP_Site       The site object with its latest published post.
+         */
+        private function get_latest_post( WP_Site $site ) {
+                if ( empty( $site->blog_id ) ) {
+                        return $site;
+                }
+
+                switch_to_blog( $site->blog_id );
+
+                $latest_post = get_posts( array(
+                        'numberposts'      => 1,
+                        'offset'           => 0,
+                        'orderby'          => 'post_date',
+                        'order'            => 'DESC',
+                        'post_type'        => 'post',
+                        'post_status'      => 'publish',
+                        'suppress_filters' => true,
+                        'exclude'          => 1,
+                ) );
+
+                $site->latest_post = reset( $latest_post );
+
+                if ( ! $site->latest_post ) {
+                        restore_current_blog();
+
+                        return $site;
+                }
+
+                $post_thumbnail_id = get_post_thumbnail_id( $site->latest_post );
+                if ( ! empty( $post_thumbnail_id ) ) {
+                        $site->latest_post->images = array();
+
+                        foreach( (array) get_intermediate_image_sizes() as $size ) {
+                                $site->latest_post->images[ $size ] = wp_get_attachment_image_url( $post_thumbnail_id, $size );
+                        }
+                }
+
+                // Only keep what BuddyPress needs
+                $fields = array_fill_keys( array(
+                        'ID', 'post_content', 'post_title', 'post_excerpt', 'guid', 'images'
+                ), true );
+
+                foreach ( $site->latest_post as $property => $value ) {
+                        if ( ! empty( $fields[ $property ] ) ) {
+                                continue;
+                        }
+
+                        unset( $site->latest_post->{$property} );
+                }
+
+                restore_current_blog();
+
+                return $site;
+        }
+
+        /**
+         * Edit the query to add BuddyPress custom orders or search features.
+         *
+         * @since  2.7.0
+         *
+         * @param  array  $pieces A compacted array of site query clauses.
+         * @return array          The same/edited compacted array of site query clauses.
+         */
+        public function edit_query( $pieces = array() ) {
+                global $wpdb;
+
+                $buddypress_orders = array(
+                        'last_activity' => true,
+                        'name'          => true,
+                        'RAND()'        => true,
+                );
+
+                // Bail if we don't need to edit the query
+                if ( empty( $this->query_vars['meta_query'] ) && empty( $this->query_vars['orderby'] ) ) {
+                        return $pieces;
+                }
+
+                // There's no WordPress blogmeta table for now but it can change!
+                if ( isset( $wpdb->blogmeta ) ) {
+                        $reset_blogmeta = $wpdb->blogmeta;
+                }
+
+                // Use the BuddyPress metadata table
+                $wpdb->blogmeta = buddypress()->blogs->table_name_blogmeta;
+
+                // Add the main table name to each existing $where clauses to avoid SQL warnings.
+                if ( ! empty( $pieces['where' ] ) && ! empty( $this->sql_clauses['where'] ) && $pieces['where'] === join( ' AND ', $this->sql_clauses['where'] ) ) {
+                        $possible_fields = array_diff_key( $this->query_var_defaults, array(
+                                'fields'            => false,
+                                'number'            => false,
+                                'offset'            => false,
+                                'no_found_rows'     => false,
+                                'orderby'           => false,
+                                'order'             => false,
+                                'search_columns'    => false,
+                                'count'             => false,
+                                'date_query'        => false,
+                                'update_site_cache' => false,
+                        ) );
+
+                        $sql_clauses = array();
+                        foreach ( array_keys( $possible_fields ) as $key ) {
+                                if ( empty( $this->sql_clauses['where'][$key] ) ) {
+                                        continue;
+                                }
+
+                                $kc = $key;
+
+                                if ( 0 === strpos( $key, 'site' ) ) {
+                                        $kc = 'blog_id';
+                                } elseif ( 0 === strpos( $key, 'network' ) ) {
+                                        $kc = 'site_id';
+                                }
+
+                                $sql_clauses[$key] = str_replace( $kc, $wpdb->blogs . '.' . $kc,  $this->sql_clauses['where'][$key] );
+                        }
+
+                        if ( ! empty( $sql_clauses ) ) {
+                                $pieces['where' ] = join( ' AND ', $sql_clauses );
+                        }
+                }
+
+                /** Meta Queries *****************************************************/
+
+                if ( ! empty( $this->query_vars['meta_query'] ) ) {
+                        $meta_query = new WP_Meta_Query( $this->query_vars['meta_query'] );
+
+                        $parts = $meta_query->get_sql( 'blog', $wpdb->blogs, 'blog_id' );
+
+                        if ( 'blog_id' === $pieces['fields'] ) {
+                                $pieces['fields'] = "{$wpdb->blogs}.blog_id";
+                        }
+
+                        if ( ! empty( $parts['join'] ) ) {
+                                if ( ! isset( $pieces['join'] ) ) {
+                                        $pieces['join'] = $parts['join'];
+                                } else {
+                                        $pieces['join'] .= $parts['join'];
+                                }
+                        }
+
+                        if ( ! empty( $parts['where'] ) ) {
+                                if ( empty( $pieces['where'] ) ) {
+                                        $pieces['where'] = '1=1' . $parts['where'];
+                                } else {
+                                        $pieces['where'] .= $parts['where'];
+                                }
+                        }
+                }
+
+                /** Custom order *****************************************************/
+
+                if ( ! empty( $this->query_vars['orderby'] ) ) {
+                        // Alphabetical or active order
+                        if ( 'name' === $this->query_vars['orderby'] || 'last_activity' === $this->query_vars['orderby'] ) {
+                                if ( 'blog_id' === $pieces['fields'] ) {
+                                        $pieces['fields'] = "{$wpdb->blogs}.blog_id";
+                                }
+
+                                $pieces['fields'] .= sprintf( ', bm.meta_value as %s', $this->query_vars['orderby'] );
+                                $join = " INNER JOIN {$wpdb->blogmeta} bm ON ({$wpdb->blogs}.blog_id = bm.blog_id )";
+
+                                if ( empty( $pieces['join'] ) ) {
+                                        $pieces['join']  = $join;
+                                } else {
+                                        $pieces['join'] .= $join;
+                                }
+
+                                $where = sprintf( " AND bm.meta_key = '%s'", $this->query_vars['orderby'] );
+
+                                if ( empty( $pieces['where'] ) ) {
+                                        $pieces['where'] = '1=1' . $where;
+                                } else {
+                                        $pieces['where'] .= $where;
+                                }
+
+                                $pieces['orderby'] = ' ' . $this->query_vars['orderby'] . ' ' . $this->query_vars['order'] ;
+
+                        // Random order
+                        } elseif ( 'RAND()' === $this->query_vars['orderby'] ) {
+                                $pieces['orderby'] = $this->query_vars['orderby'];
+                        }
+                }
+
+                // Reset the global blogmeta table if needed.
+                if ( ! empty( $reset_blogmeta ) ) {
+                        $wpdb->blogmeta = $reset_blogmeta;
+                }
+
+                return $pieces;
+        }
+
+        /**
+         * Return results as BP_Blogs_Blog::get() expects it.
+         *
+         * @since  2.7.0
+         *
+         * @return array Multidimensional results array, structured as follows:
+         *               'blogs' - Array of located blog objects.
+         *               'total' - A count of the total blogs matching the filter params.
+         */
+        public function get_results() {
+                // Single site query.
+                if ( $this->query_vars['no_found_rows'] ) {
+                        return array( 'blogs' => array_values( $this->sites ) );
+                }
+
+                return array( 'blogs' => array_values( $this->sites ), 'total' => $this->found_sites );
+        }
+
+        /**
+         * Return the site ids found.
+         *
+         * @since  2.7.0
+         *
+         * @return array The list of site ids.
+         */
+        public function get_ids() {
+                return array_map( 'intval', wp_list_pluck( $this->sites, 'blog_id' ) );
+        }
+}

src/bp-blogs/site/activity.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site activity.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSiteActivity
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Register activity actions for the site subscriptions feature.
+ *
+ * @since 2.7.0
+ */
+function bp_blogs_site_register_subscription_activity_action() {
+        if ( bp_disable_site_subscriptions() ) {
+                return;
+        }
+
+        /**
+         * 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_is_site() && bp_blogs_current_site_can_subscribe() ) || bp_is_user() || bp_is_activity_directory() ) {
+                bp_activity_set_action(
+                        buddypress()->blogs->id,
+                        'site_subscription',
+                        __( 'New site subscription', 'buddypress' ),
+                        'bp_blogs_site_format_activity_action_new_subscription',
+                        __( 'Site Subscriptions', 'buddypress' ),
+                        array( 'activity', 'member', 'site', 'member_sites' ),
+                        20
+                );
+        }
+}
+add_action( 'bp_blogs_register_activity_actions', 'bp_blogs_site_register_subscription_activity_action' );
+
+ /**
+ * Activity action callback for new site subscriptions
+ *
+ * @since 2.7.0
+ *
+ * @param  string                    $action   The content of the action.
+ * @param  BP_Activity_Activity|null $activity The activity object.
+ * @return string The content of the action.
+ */
+function bp_blogs_site_format_activity_action_new_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_url    = trailingslashit( bp_get_root_domain() );
+        $root_domain = get_current_site()->domain;
+        $protocol    = 'http://';
+        if ( is_ssl() ) {
+                $protocol = 'https://';
+        }
+
+        if ( (int) $activity->item_id !== (int) get_current_site()->blog_id ) {
+                if ( is_subdomain_install() ) {
+                        $slug = trim( str_replace( $root_domain, '', $blog_url ), '.' );
+                        $slug = str_replace( $protocol, '', $slug );
+                } else {
+                        $slug = trim( str_replace( $root_url, '', $blog_url ), '/' );
+                }
+
+                $community_link = bp_blogs_get_site_community_url( $slug );
+        } else {
+                $community_link = bp_blogs_get_site_community_url( bp_blogs_get_root_site_slug() );
+        }
+
+        $action = sprintf(
+                __( '%1$s subscribed to the site %2$s', 'buddypress' ),
+                $user_link,
+                '<a href="' . esc_url( $community_link ) . '">' . esc_html( $blog_name ) . '</a>'
+        );
+
+        return apply_filters( 'bp_blogs_site_format_activity_action_new_subscription', $action, $activity );
+}
+
+/**
+ * Add an activity once the user subscribed to the site.
+ *
+ * @since  2.7.0
+ *
+ * @param  int            $user_id The user id who subscribed.
+ * @param  WP_Site|object $site    The site object he subscribed to.
+ */
+function bp_blogs_site_activity_user_subcribed( $user_id, $site ) {
+        $action = sprintf(
+                __( '%1$s subscribed to the site %2$s', 'buddypress' ),
+                bp_core_get_userlink( $user_id ),
+                '<a href="' . esc_url( bp_blogs_get_site_community_url( $site->slug ) ) . '">' . esc_html( $site->name ) . '</a>'
+        );
+
+        bp_blogs_record_activity( array(
+                'action'  => $action,
+                'type'    => 'site_subscription',
+                'item_id' => $site->blog_id,
+        ) );
+
+        // Update the blog's last activity.
+        bp_blogs_update_blogmeta( $site->blog_id, 'last_activity', bp_core_current_time() );
+}
+add_action( 'bp_blogs_after_site_subscribed', 'bp_blogs_site_activity_user_subcribed', 10, 2 );
+
+/**
+ * Remove an activity once the user unsubscribed to the site.
+ *
+ * @since  2.7.0
+ *
+ * @param  int                $user_id The user id who unsubscribed.
+ * @param  WP_Site|object|int $site    The site object or site ID he unsubscribed to.
+ */
+function bp_blogs_site_activity_user_unsubscribed( $user_id, $site ) {
+        $site_id = 0;
+
+        if ( ! is_numeric( $site ) && ! empty( $site->blog_id ) ) {
+                $site_id = $site->blog_id;
+        } else {
+                $site_id = $site;
+        }
+
+        if ( empty( $site_id ) ) {
+                return false;
+        }
+
+        bp_blogs_delete_activity( array(
+                'user_id' => $user_id,
+                'item_id' => $site_id,
+                'type'    => 'site_subscription',
+        ) );
+}
+add_action( 'bp_blogs_after_site_unsubscribed',     'bp_blogs_site_activity_user_unsubscribed', 10, 2 );
+add_action( 'bp_blogs_after_remove_user_from_site', 'bp_blogs_site_activity_user_unsubscribed', 10, 2 );

src/bp-blogs/site/adminbar.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site adminbar.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSiteAdminbar
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+// Put the code for the site adminbar here!

src/bp-blogs/site/cache.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site cache.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSiteCache
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Update the site caches.
+ *
+ * @since  2.7.0
+ *
+ * @param  WP_Site|object $site The site object.
+ */
+function bp_blogs_update_site_caches( $site ) {
+        wp_cache_add( $site->blog_id, $site,          'bp_site'       );
+        wp_cache_add( $site->slug,    $site->blog_id, 'bp_site_slugs' );
+}
+
+/**
+ * Clean all site caches
+ *
+ * @since 2.7.0
+ *
+ * @param WP_Site|object|int $site The site object or ID to be
+ *                                 cleaned from the cache.
+ */
+function bp_blogs_clean_site_caches( $site ) {
+        if ( is_numeric( $site ) ) {
+                $site = bp_blogs_get_site( $site );
+        }
+
+        if ( empty( $site->blog_id ) ) {
+                return;
+        }
+
+        wp_cache_delete( $site->blog_id, 'bp_site'       );
+        wp_cache_delete( $site->slug,    'bp_site_slugs' );
+
+        /**
+         * Fires immediately after the given site's cache is cleaned.
+         *
+         * @since 2.7.0
+         *
+         * @param int     $blog_id The Site ID.
+         * @param WP_User $site    The Site object.
+         */
+        do_action( 'bp_blogs_clean_site_caches', $site->blog_id, $site );
+}
+add_action( 'refresh_blog_details',          'bp_blogs_clean_site_caches' );
+add_action( 'bp_blogs_remove_blog',          'bp_blogs_clean_site_caches' );
+add_action( 'bp_blogs_remove_data_for_blog', 'bp_blogs_clean_site_caches' );
+add_action( 'bp_blogs_remove_blog_for_user', 'bp_blogs_clean_site_caches' );
+
+/**
+ * Clean site cache on blogmeta edits.
+ *
+ * @since  2.7.0
+ *
+ * @param  int $meta_ids ID of updated metadata entry.
+ * @param  int $site_id  ID of the site.
+ */
+function bp_blogs_meta_edit_clean_caches( $meta_ids, $site_id, $meta_key ) {
+        $meta_keys = array(
+                'name'                   => true,
+                'description'            => true,
+                'last_activity'          => true,
+                'site_admins'            => true,
+                'disallow_subscriptions' => true,
+        );
+
+        if ( empty( $meta_keys[ $meta_key ] ) ) {
+                return;
+        }
+
+        bp_blogs_clean_site_caches( $site_id );
+}
+add_action( 'deleted_blog_meta', 'bp_blogs_meta_edit_clean_caches', 10, 3 );
+add_action( 'updated_blog_meta', 'bp_blogs_meta_edit_clean_caches', 10, 3 );
+
+/**
+ * Bust blogs caches when a user was deleted or marked as spam
+ *
+ * @since 2.7.0
+ *
+ * @param int $user_id ID of the user whose blog cache should be cleared.
+ */
+function bp_blogs_user_sites_clean_caches( $user_id = 0 ) {
+        $sites = BP_Blogs_Blog::get_blog_ids_for_user( $user_id, null );
+
+        if ( empty( $sites ) ) {
+                return;
+        }
+
+        foreach ( $sites as $site_id ) {
+                bp_blogs_clean_site_caches( $site_id );
+        }
+}
+add_action( 'bp_blogs_before_remove_data', 'bp_blogs_user_sites_clean_caches' );
+add_action( 'bp_blogs_restore_data',       'bp_blogs_user_sites_clean_caches' );
+
+/**
+ * Bust blog caches when a user subcribes or unsubscribe to a site
+ *
+ * @since 2.7.0
+ *
+ * @param int            $user_id ID of the user.
+ * @param WP_Site|object $site    The site object.
+ */
+function bp_blogs_subscription_site_clean_caches( $user_id, $site ) {
+        bp_blogs_clean_site_caches( $site );
+
+        // Totals
+        wp_cache_delete( 'bp_total_blogs_for_user_'              . $user_id, 'bp' );
+        wp_cache_delete( 'bp_total_site_subscriptions_for_user_' . $user_id, 'bp' );
+}
+add_action( 'bp_blogs_after_site_subscribed',   'bp_blogs_subscription_site_clean_caches', 10, 2 );
+add_action( 'bp_blogs_after_site_unsubscribed', 'bp_blogs_subscription_site_clean_caches', 10, 2 );

src/bp-blogs/site/filters.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site Filters
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSiteFilters
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+add_filter( 'bp_get_site_description',          'wptexturize'       );
+add_filter( 'bp_get_sitename',                  'wptexturize'       );
+add_filter( 'bp_get_site_description',          'convert_smilies'   );
+add_filter( 'bp_get_site_description',          'convert_chars'     );
+add_filter( 'bp_get_sitename',                  'convert_chars'     );
+add_filter( 'bp_get_site_description',          'wpautop'           );
+add_filter( 'bp_get_site_description',          'make_clickable', 9 );
+add_filter( 'bp_get_sitename',                  'wp_filter_kses', 1 );
+add_filter( 'bp_get_site_description',          'wp_filter_kses', 1 );
+add_filter( 'bp_get_site_description',          'stripslashes'      );
+add_filter( 'bp_get_site_description_editable', 'stripslashes'      );
+add_filter( 'bp_get_sitename',                  'stripslashes'      );
+add_filter( 'bp_get_site_name_editable',        'stripslashes'      );
+
+
+/**
+ * Generate the avatar upload directory path for a given site.
+ *
+ * @since 2.7.0
+ *
+ * @param int $site_id Optional. ID of the blog. Default: ID of the
+ *        current site.
+ * @return array
+ */
+function blogs_avatar_upload_dir( $site_id = 0 ) {
+
+        if ( empty( $site_id ) ) {
+                $site_id = bp_blogs_get_current_site_id();
+        }
+
+        $directory = 'blog-avatars';
+        $path      = bp_core_avatar_upload_path() . '/' . $directory . '/' . $site_id;
+        $newbdir   = $path;
+        $newurl    = bp_core_avatar_url() . '/' . $directory . '/' . $site_id;
+        $newburl   = $newurl;
+        $newsubdir = '/' . $directory . '/' . $site_id;
+
+        /**
+         * Filters the avatar upload directory path for a given site.
+         *
+         * @since 2.7.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
+        ) );
+}
+
+/**
+ * Eventually filters get_blogs_of_user() to make sure
+ * subscribers marked as spam won't generate the sites
+ * to be marked as spam too.
+ *
+ * @since  2.7.0
+ */
+function bp_blogs_site_maybe_filter_get_blogs_of_user() {
+        $action = bp_admin_list_table_current_bulk_action();
+
+        if ( 'spam' !== $action || 'users-network' !== get_current_screen()->id ) {
+                return;
+        }
+
+        // Trigger the filter.
+        bp_blogs_get_blogs_of_user_add_filters();
+}
+add_action( 'wpmuadminedit', 'bp_blogs_site_maybe_filter_get_blogs_of_user' );

src/bp-blogs/site/functions.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site functions.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSiteFunctions
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Return a default slug for the main site of the network.
+ *
+ * @since  2.7.0
+ *
+ * @param  string $default The default slug for the root site
+ * @return string          The main site's slug.
+ */
+function bp_blogs_get_root_site_slug( $default = 'root' ) {
+        /**
+         * Filters the root site's slug.
+         *
+         * @since 2.7.0
+         *
+         * @param string $default the default slug (root).
+         */
+        return sanitize_title( apply_filters( 'bp_blogs_get_root_site_slug', $default ) );
+}
+
+/**
+ * Get the community url for a site.
+ *
+ * @since  2.7.0
+ *
+ * @param  string $slug The slug of the site.
+ * @return string       The community url of the site.
+ */
+function bp_blogs_get_site_community_url( $slug = '' ) {
+        if ( ! $slug ) {
+                $slug = bp_blogs_get_current_site_slug();
+        }
+
+        $url = trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/' . $slug );
+
+        /**
+         * Filters the site's community url.
+         *
+         * @since 2.7.0
+         *
+         * @param string $url  The community url of the site.
+         * @param string $slug The slug of the site.
+         */
+        return apply_filters( 'bp_blogs_get_site_community_url', $url, $slug );
+}
+
+/**
+ * Get a single site for the requested slug or ID.
+ *
+ * @since  2.7.0
+ *
+ * @param  string|int     $slug The slug or ID of the blog
+ * @return WP_Site|object       The site object.
+ */
+function bp_blogs_get_site( $slug = '' ) {
+        if ( empty( $slug ) ) {
+                return false;
+        }
+
+        $slug = trim( $slug, '/' );
+        $query_vars = array(
+                'single_site' => true,
+                'offset'      => 0,
+                'number'      => 1,
+        );
+
+        if ( is_numeric( $slug ) ) {
+                $query_vars['ID'] = (int) $slug;
+                $site_id          = $query_vars['ID'];
+        } else {
+                if ( is_subdomain_install() ) {
+                        $query_vars['domain__in'] = array( $slug . '.' . get_current_site()->domain );
+                } else {
+                        $query_vars['path__in'] = array( get_current_site()->path . $slug . '/' );
+                }
+
+                $site_id = wp_cache_get( $slug, 'bp_site_slugs' );
+        }
+
+        // Look in the cache.
+        if ( ! empty( $site_id ) ) {
+                $site = wp_cache_get( $site_id, 'bp_site' );
+        }
+
+        // The Site wasn't found in cache, query for it.
+        if ( empty( $site->blog_id ) ) {
+                if ( true === (bool) apply_filters( 'bp_blogs_use_bp_site_query', true ) && function_exists( 'get_sites' ) ) {
+                        $queried_site = new BP_Site_Query( $query_vars );
+                        $result = $queried_site->get_results();
+                } else {
+                        $result = BP_Blogs_Blog::legacy_get( $query_vars );
+                }
+
+                if ( empty( $result['blogs'] ) ) {
+                        return false;
+                }
+
+                $site = reset( $result['blogs'] );
+
+                if ( empty( $site->blog_id ) ) {
+                        return false;
+                }
+
+                if ( ! is_a( $site, 'WP_Site' ) ) {
+                        $bp_props = clone $site;
+
+                        // Reset the site so that it's a WP_Site instance
+                        $site = get_blog_details( $site->blog_id, false );
+
+                        foreach ( $bp_props as $bp_prop_key => $bp_prop ) {
+                                if ( isset( $site->{$bp_prop_key} ) ) {
+                                        continue;
+                                }
+
+                                $site->{$bp_prop_key} = $bp_prop;
+                        }
+
+                        $site->site_admins = bp_blogs_get_blogmeta( $site->blog_id, 'site_admins' );
+                        $site->url         = bp_blogs_get_blogmeta( $site->blog_id, 'url' );
+                }
+
+                $site->slug = '';
+                if ( (int) bp_get_root_blog_id() === (int) $site->blog_id ) {
+                        $site->slug = bp_blogs_get_root_site_slug();
+                } elseif ( is_subdomain_install() ) {
+                        $site->slug = trim( str_replace( get_current_site()->domain, '', $site->domain ), '.' );
+                } else {
+                        $site->slug = trim( str_replace( get_current_site()->path, '', $site->path ), '/' );
+                }
+
+                // How many users ?
+                $site->total_users = BP_Blogs_Blog::get_site_users_count( $site->blog_id );
+
+                // Update Site caches.
+                bp_blogs_update_site_caches( $site );
+        }
+
+        // Bail if the site is not showable.
+        if ( 1 === (int) $site->mature || 1 === (int) $site->spam || 1 === (int) $site->archived || 1 === (int) $site->deleted ) {
+                return false;
+        }
+
+        if ( ! bp_is_blogs_component() && ! bp_current_action() ) {
+                return $site;
+        }
+
+        // Check if we need to switch the blog.
+        $needs_switch = ! bp_is_root_blog( (int) $site->blog_id );
+
+        // Check the current user caps for this site
+        if ( $needs_switch ) {
+                switch_to_blog( $site->blog_id );
+        }
+
+        $site->is_member = current_user_can( 'read' );
+
+        if ( current_user_can( 'manage_options' ) ) {
+                $site->is_admin = true;
+        } elseif ( current_user_can( 'edit_posts' ) ) {
+                $site->is_contributor = true;
+        }
+
+        // Most of the time, there will be only one admin.
+        if ( 1 === count( $site->site_admins ) ) {
+                $user_id = reset( $site->site_admins );
+                $site->admins_list = array( get_user_by( 'id', $user_id ) );
+
+        // NB: WordPress introduced the 'role__in' parameter in 4.4
+        } else {
+                $site->admins_list = get_users( array(
+                        'include' => $site->site_admins,
+                        'orderby' => 'ID',
+                        'order'   => 'ASC',
+                ) );
+        }
+
+        // Login url
+        $site->login_url = wp_login_url();
+
+        if ( $needs_switch ) {
+                restore_current_blog();
+        }
+
+        /**
+         * Use this filter to add properties to the site.
+         *
+         * @since  2.7.0
+         *
+         * @param  WP_Site|object $site The site object.
+         */
+        return apply_filters( 'bp_blogs_get_site', $site );
+}
+
+/**
+ * Get the current site displayed.
+ *
+ * @since  2.7.0
+ *
+ * @return WP_Site|object The displayed site object.
+ */
+function bp_blogs_get_current_site() {
+        $bp = buddypress();
+
+        $current_site = false;
+
+        if ( isset( $bp->blogs->current_site ) ) {
+                $current_site = $bp->blogs->current_site;
+        }
+
+        /**
+         * Filters the Site object corresponding to the current site.
+         *
+         * @since 2.7.0
+         *
+         * @param WP_Site|object $current_site Current Site object.
+         */
+        return apply_filters( 'bp_blogs_get_current_site', $current_site );
+}
+
+/**
+ * Get a specific property of the current site object
+ *
+ * @since  2.7.0
+ *
+ * @param  string $property The key of the property to get.
+ * @return mixed            The value of the property.
+ */
+function bp_blogs_get_current_site_property( $property = '' ) {
+        $current_site = bp_blogs_get_current_site();
+
+        if ( empty( $property ) || ! isset( $current_site->{$property} ) ) {
+                return false;
+        }
+
+        /**
+         * Dynamic Filter to edit the value of the specific property
+         *
+         * @since 2.7.0
+         *
+         * @param mixed          $value        The value of the property.
+         * @param WP_Site|object $current_site Current Site object.
+         */
+        return apply_filters( "bp_blogs_current_site_{$property}", $current_site->{$property}, $current_site );
+}
+
+/**
+ * Get the current site ID.
+ *
+ * @since  2.7.0
+ *
+ * @return int The current site ID.
+ */
+function bp_blogs_get_current_site_id() {
+        return (int) bp_blogs_get_current_site_property( 'blog_id' );
+}
+
+/**
+ * Get the current site name.
+ *
+ * @since  2.7.0
+ *
+ * @return string The current site name.
+ */
+function bp_blogs_get_current_site_name() {
+        return esc_html( bp_blogs_get_current_site_property( 'name' ) );
+}
+
+/**
+ * Get the current site slug.
+ *
+ * @since  2.7.0
+ *
+ * @return string The current site slug.
+ */
+function bp_blogs_get_current_site_slug() {
+        return sanitize_user( bp_blogs_get_current_site_property( 'slug' ) );
+}
+
+/**
+ * Get the current site url.
+ *
+ * @since  2.7.0
+ *
+ * @return string The current site url.
+ */
+function bp_blogs_get_current_site_url() {
+        return esc_url( bp_blogs_get_current_site_property( 'url' ) );
+}
+
+/**
+ * Get the public property of the current site.
+ *
+ * @since  2.7.0
+ *
+ * @return bool True if the site is public. False otherwise.
+ */
+function bp_blogs_current_site_is_public() {
+        return (bool) bp_blogs_get_current_site_property( 'public' );
+}
+
+/**
+ * Does the current user can access to the displayed site?
+ *
+ * @since  2.7.0
+ *
+ * @return bool True if the user can access. False otherwise.
+ */
+function bp_blogs_current_site_has_access() {
+        return (bool) bp_blogs_get_current_site_property( 'user_has_access' );
+}
+
+/**
+ * Return the list of Site Admin user ids.
+ *
+ * @since  2.7.0
+ *
+ * @return array The list of Site Admin user ids.
+ */
+function bp_blogs_current_site_get_admins() {
+        return (array) bp_blogs_get_current_site_property( 'site_admins' );
+}
+
+/**
+ * Can users subscribe to the site?
+ *
+ * @since  2.7.0
+ *
+ * @return bool True if subscriptions are enabled. False otherwise.
+ */
+function bp_blogs_current_site_can_subscribe() {
+        if ( bp_disable_site_subscriptions() ) {
+                return false;
+        }
+
+        $can = bp_blogs_current_site_is_public();
+
+        if ( $can ) {
+                $can = ! bp_blogs_get_current_site_property( 'disallow_subscriptions' );
+        }
+
+        /**
+         * Filters subscriptions setting for the site
+         *
+         * @since 2.7.0
+         *
+         * @param bool $can True if subscriptions are enabled. False otherwise.
+         */
+        return (bool) apply_filters( 'bp_get_site_can_subscribe', $can );
+}
+
+/**
+ * Edit the BP User Query query vars to only get the site members
+ *
+ * @since  2.7.0
+ *
+ * @param  BP_User_Query|null $site_user_query The BP User Query object
+ */
+function bp_blogs_set_site_user_query( BP_User_Query $site_user_query = null ) {
+        $bp = buddypress();
+
+        // Bail if we're not in a site members loop.
+        if ( empty( $bp->blogs->site->members->loop_args['blog_id'] ) ) {
+                return;
+        }
+
+        $blog_id = $bp->blogs->site->members->loop_args['blog_id'];
+
+        $is_contributor = null;
+        if ( isset( $bp->blogs->site->members->loop_args['is_contributor'] ) ) {
+                $is_contributor = $bp->blogs->site->members->loop_args['is_contributor'];
+        }
+
+        $order = null;
+        if ( 'last_joined' === $bp->blogs->site->members->loop_args['type'] ) {
+                $order = 'DESC';
+        } elseif ( 'first_joined' === $bp->blogs->site->members->loop_args['type'] ) {
+                $order = 'ASC';
+        }
+
+        $bp->blogs->site->members->extra = BP_Blogs_Blog::get_site_user_ids( $blog_id, $is_contributor, $order );
+
+        if ( empty( $bp->blogs->site->members->extra ) ) {
+                $user_ids = array( 0 );
+        } else {
+                $user_ids = wp_list_pluck( $bp->blogs->site->members->extra, 'user_id' );
+
+                if ( ! is_null( $order ) ) {
+                        $bp->blogs->site->members->order_by = array_merge( array( 'u.id' ), wp_parse_id_list( $user_ids ) );
+                }
+        }
+
+        // Only include site members
+        $site_user_query->query_vars_raw['include'] = $user_ids;
+        $site_user_query->query_vars['include']     = wp_parse_id_list( $user_ids );
+}
+
+/**
+ * Edit the order of the BP User Query clause if needed.
+ *
+ * @since  2.7.0
+ *
+ * @param  BP_User_Query|null $site_user_query The BP User Query object
+ */
+function bp_blogs_pre_site_user_query( BP_User_Query $site_user_query = null ) {
+        $bp = buddypress();
+
+        if ( empty( $bp->blogs->site->members->order_by ) ) {
+                return;
+        }
+
+        $site_user_query->uid_clauses['orderby'] = "ORDER BY FIELD(" . join( ',', $bp->blogs->site->members->order_by ) . ")";
+}
+
+/**
+ * Add specific site extra to members fetched in the BP User Query
+ *
+ * @since  2.7.0
+ *
+ * @param  BP_User_Query|null $site_user_query The BP User Query object
+ */
+function bp_blogs_user_query_site_populate_extras( BP_User_Query $site_user_query = null ) {
+        $bp = buddypress();
+
+        if ( empty( $bp->blogs->site->members->extra ) ) {
+                return;
+        }
+
+        $admins = bp_blogs_current_site_get_admins();
+
+        foreach ( (array) $bp->blogs->site->members->extra as $extra ) {
+                if ( isset( $site_user_query->results[ $extra->user_id ] ) ) {
+                        $site_user_query->results[ $extra->user_id ]->is_contributor = (int) $extra->is_contributor;
+
+                        if ( ! empty( $admins ) && in_array( $extra->user_id, $admins ) ) {
+                                $site_user_query->results[ $extra->user_id ]->is_admin = 1;
+                        }
+                }
+        }
+}
+
+/**
+ * BuddyPress Restricted Blogmetas.
+ *
+ * @since  2.7.0
+ *
+ * @return array The list of restricted Blogmetas.
+ */
+function bp_blogs_get_restricted_options() {
+        return array(
+                'name',
+                'description',
+                'last_activity',
+                'close_comments_for_old_posts',
+                'close_comments_days_old',
+                'thread_comments_depth',
+                'site_admins',
+                'url',
+                'disallow_subscriptions',
+        );
+}
+
+/**
+ * Register custom settings for the site's manage settings screen.
+ *
+ * @since  2.7.0
+ *
+ * @param  string $option_name The 'meta_key' you choose for the blogmeta
+ * @param  array|string $args {
+ *     An array of required arguments.
+ *     @type string   $display_function   Required. The name of the function to use
+ *                                        for the setting display.
+ *     @type string   $sanitize_function  Required. The name of the function to use
+ *                                        to sanitize the value of the option.
+ * }
+ * @return bool       True if the setting has been registered. False otherwise.
+ */
+function bp_blogs_register_site_settings( $option_name, $args = array() ) {
+        if ( ! doing_action( 'bp_blogs_setup_site_globals' ) ) {
+                return false;
+        }
+
+        $bp           = buddypress();
+        $core_options = bp_blogs_get_restricted_options();
+        $option_name  = sanitize_key( $option_name );
+
+        $restricted = array_flip( array_merge( $core_options, wp_list_pluck( $bp->blogs->site->settings, 'option_name' ) ) );
+
+        if ( empty( $option_name ) || isset( $restricted[ $option_name ] ) ) {
+                return false;
+        }
+
+        $option_args = wp_parse_args( $args, array(
+                'display_function'  => '',
+                'sanitize_function' => '',
+        ) );
+
+        $option_args['option_name'] = $option_name;
+
+        $bp->blogs->site->settings[ $option_name ] = (object) $option_args;
+
+        // Settings is registered.
+        return true;
+}
+
+/**
+ * Get all or a specific site custom setting.
+ *
+ * @since  2.7.0
+ *
+ * @param  string             $option The 'meta_key' of the custom option.
+ * @return array|object|false         The list of all registered settings.
+ *                                    The specific requested setting object.
+ *                                    False or an empty array if no settings were found.
+ */
+function bp_blogs_get_site_settings( $option = '' ) {
+        $settings = buddypress()->blogs->site->settings;
+
+        if ( empty( $option ) ) {
+                return $settings;
+        } elseif ( ! isset( $settings[ $option ] ) || ! $settings[ $option ]->display_function || ! $settings[ $option ]->sanitize_function ) {
+                return false;
+        }
+
+        return $settings[ $option ];
+}
+
+/**
+ * Check if avatar uploads are enabled for the site.
+ *
+ * @since 2.7.0
+ *
+ * @return bool true if avatar uploads are enabled, false otherwise.
+ */
+function bp_blogs_is_site_avatar_uploads_enabled() {
+        $bp = buddypress();
+
+        /**
+         * Check if :
+         * - user can upload site avatars
+         * - the WordPress show avatars setting is enabled
+         * - the new avatar UI is not disabled.
+         */
+        $is_avatar_enabled = ! bp_disable_site_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 site.
+         *
+         * @since 2.7.0
+         *
+         * @param bool $is_avatar_enabled true if avatar uploads are enabled, false otherwise.
+         */
+        return (bool) apply_filters( 'bp_blogs_is_site_avatar_uploads_enabled', $is_avatar_enabled );
+}
+
+/**
+ * Register the Site Icon script into the common scripts.
+ * This script is making sure we can set an avatar using a WordPress Site Icon.
+ *
+ * @since  2.7.0
+ *
+ * @param  array $scripts The BuddyPress common scripts.
+ * @return array          The BuddyPress common scripts.
+ */
+function blogs_register_site_icon_script( $scripts = array() ) {
+        $min = bp_core_get_minified_asset_suffix();
+        $uri = buddypress()->plugin_url . 'bp-blogs/site/js/';
+
+        return array_merge( $scripts, array(
+                'bp-site-icon' => array(
+                        'file'         => sprintf( '%1$ssite-icon%2$s.js', $uri, $min ),
+                        'dependencies' => array( 'bp-avatar' ),
+                        'footer'       => true
+                ),
+        ) );
+}
+add_filter( 'bp_core_register_common_scripts', 'blogs_register_site_icon_script', 10, 1 );
+
+/**
+ * Checks the Site Icon can be used as this feature was introduced in WordPress 4.3.
+ *
+ * @since  2.7.0
+ *
+ * @return bool True if the site icon can be used. False otherwise.
+ */
+function bp_blogs_is_site_icon_enabled() {
+        /**
+         * filter here to disable the "site icon avatar"
+         *
+         * @since  2.7.0
+         *
+         * @param  bool $value True to use the site icon, false otherwise.
+         */
+        return (bool) apply_filters( 'bp_blogs_is_site_icon_enabled', function_exists( 'get_site_icon_url' ) );
+}
+
+/**
+ * Set the Attachments script data for the site icon.
+ *
+ * @since  2.7.0
+ *
+ * @param  array  $script_data Script datas for the Uploader UI.
+ * @return array               Script datas for the Uploader UI.
+ */
+function bp_blogs_set_site_icon_script_data( $script_data = array() ) {
+        if ( empty( $script_data['bp_params']['item_id'] ) ) {
+                return $script_data;
+        }
+
+        // The site id.
+        $site_id = $script_data['bp_params']['item_id'];
+
+        // By default, we set no icon to true.
+        $params  = array( 'no_icon' => true );
+        $w_max   = bp_core_avatar_full_width();
+
+        // Try to get the site icon
+        $url = get_site_icon_url( $w_max, '', $site_id );
+
+        if ( ! empty( $url ) ) {
+                $params = array(
+                        'id'      => (int) get_blog_option( $site_id, 'site_icon', 0 ),
+                        'src'     => $url,
+                        'no_icon' => false,
+                        'max_dim' => $w_max,
+                        'nonce'   => $script_data['bp_params']['nonces']['set'],
+                        'in_use'  => false,
+                );
+        }
+
+        // Check if the site icon is already used as the site logo.
+        if ( 'site_icon' === bp_blogs_get_blogmeta( $site_id, 'avatar_type' ) ) {
+                $params['in_use'] = true;
+        }
+
+        // Include specific params for the site icon
+        $script_data['bp_params']['site_icon'] = $params;
+
+        // Finally return the script data.
+        return $script_data;
+}
+
+/**
+ * Create a new site's profile photo out of a site icon
+ *
+ * @since  2.7.0
+ *
+ * @param  int $site_id The site ID
+ * @param  int $icon_id The ID of the site icon attachment.
+ * @return bool True on success. False otherwise.
+ */
+function blogs_site_icon_create_avatar( $site_id = 0, $icon_id = 0 ) {
+        if ( empty( $site_id ) || empty( $icon_id ) ) {
+                return false;
+        }
+
+        // Check if we need to switch the blog.
+        $needs_switch = ! bp_is_root_blog( (int) $site_id );
+
+        // Eventually switch
+        if ( $needs_switch ) {
+                switch_to_blog( $site_id );
+        }
+
+        // Get the site icon image file
+        $icon_img = get_attached_file( $icon_id );
+
+        if ( $needs_switch ) {
+                restore_current_blog();
+        }
+
+        if ( empty( $icon_img ) ) {
+                return false;
+        }
+
+        $icon_data = BP_Attachment::get_image_data( $icon_img );
+
+        if ( empty( $icon_data['width'] ) || empty( $icon_data['height'] ) ) {
+                return false;
+        }
+
+        // Create the avatar using the site icon image.
+        if ( ! bp_attachments_create_item_type( 'avatar', array(
+                'item_id'   => $site_id,
+                'object'    => 'blog',
+                'component' => 'blogs',
+                'image'     => $icon_img,
+                'crop_w'    => $icon_data['width'],
+                'crop_h'    => $icon_data['height'],
+        ) ) ) {
+                return false;
+        }
+
+        // Set the avatar type.
+        bp_blogs_update_blogmeta( $site_id, 'avatar_type', 'site_icon' );
+
+        return true;
+}
+
+/**
+ * Update the site's profile photo if the site icon was updated
+ *
+ * @since 2.7.0
+ *
+ * @param  int $option  The 'site_icon' option
+ * @param  int $icon_id The ID of the site icon attachment.
+ */
+function blogs_site_icon_update_avatar( $option = 'site_icon', $icon_id = 0 ) {
+        $icon_id = (int) $icon_id;
+        $site_id = get_current_blog_id();
+
+        if ( 'site_icon' !== bp_blogs_get_blogmeta( $site_id, 'avatar_type' ) ) {
+                return;
+        }
+
+        // Delete the Site's profile photo
+        if ( empty( $icon_id ) ) {
+                bp_core_delete_existing_avatar( array( 'item_id' => $site_id, 'object' => 'blog' ) );
+
+        // Update the Site's profile photo
+        } else {
+                blogs_site_icon_create_avatar( $site_id, $icon_id );
+        }
+}
+add_action( 'update_option_site_icon', 'blogs_site_icon_update_avatar', 10, 2 );
+
+/**
+ * Check if we need to redirect the user who just registered a new site
+ * to the Site's edit avatar manage screen.
+ *
+ * @since 2.7.0
+ */
+function bp_blogs_maybe_redirect_to_site_manage_avatar_screen() {
+        /**
+         * No need to carry on if Site signups are not allowed or
+         * if the user is not logged in yet.
+         */
+        if ( ! bp_blog_signup_enabled() || ! is_user_logged_in() ) {
+                return;
+        }
+
+        /**
+         * No need to carry on if the Site's feature is not active
+         * or if avatar uploads are disabled.
+         */
+        if ( ! bp_is_active( 'blogs', 'site' ) || ! bp_blogs_is_site_avatar_uploads_enabled() ) {
+                return;
+        }
+
+        $transient_key = sprintf( '_bp_activation_%d_redirect', bp_loggedin_user_id() );
+        $site_id = get_transient( $transient_key );
+
+        if ( empty( $site_id ) ) {
+                return;
+        }
+
+        // Delete the redirect transient
+        delete_transient( $transient_key );
+
+        $site = bp_blogs_get_site( $site_id );
+
+        if ( empty( $site->slug ) ) {
+                return;
+        }
+
+        $redirect = trailingslashit( bp_blogs_get_site_community_url( $site->slug ) . 'manage/edit-avatar' );
+
+        bp_core_add_message( __( 'Welcome to the community pages of your new site, please consider adding a site profile photo for your site', 'buddypress' ) );
+        bp_core_redirect( esc_url( $redirect ) );
+}
+add_action( 'bp_blogs_setup_nav', 'bp_blogs_maybe_redirect_to_site_manage_avatar_screen' );
+
+/**
+ * Delete the site's avatar on site removal.
+ *
+ * @since  2.7.0
+ *
+ * @param  int $site_id The site ID
+ */
+function bp_blogs_remove_site_avatar( $site_id = 0 ) {
+        bp_core_delete_existing_avatar( array( 'item_id' => $site_id, 'object' => 'blog', 'avatar_dir' => 'blog-avatars' ) );
+}
+add_action( 'bp_blogs_remove_blog', 'bp_blogs_remove_site_avatar', 10, 1 );

src/bp-blogs/site/js/site-icon.js

@@ +1 @@
+/* globals bp, _, BP_Uploader, Backbone */
+
+window.bp = window.bp || {};
+
+( function( exports, $ ) {
+
+        // Bail if not set
+        if ( typeof BP_Uploader === 'undefined' ) {
+                return;
+        }
+
+        bp.Models      = bp.Models || {};
+        bp.Collections = bp.Collections || {};
+        bp.Views       = bp.Views || {};
+        bp.Avatar      = bp.Avatar || {};
+
+        bp.Avatar.SiteIcon = {
+                start: function() {
+                        bp.Avatar.nav.on( 'bp-avatar-view:changed', _.bind( this.setView, this ) );
+
+                        this.site_icon = new Backbone.Model( _.extend(
+                                _.pick( BP_Uploader.settings.defaults.multipart_params.bp_params,
+                                        'object',
+                                        'item_id'
+                                ),
+                                BP_Uploader.settings.defaults.multipart_params.bp_params.site_icon
+                        ) );
+
+                        bp.Avatar.Attachment.on( 'change:url', _.bind( this.updateSiteIcon, this ) );
+                },
+
+                setView: function( view ) {
+                        if ( 'site_icon' !== view ) {
+                                return;
+                        }
+
+                        // Create the view
+                        var siteIconView = new bp.Views.SiteIcon( { model: this.site_icon } );
+
+                        // Add it to Avatar views
+                        bp.Avatar.views.add( { id: 'site_icon', view: siteIconView } );
+
+                        // Display it
+                        siteIconView.inject( '.bp-avatar' );
+                },
+
+                updateSiteIcon: function( model ) {
+                        if ( ( 'deleted' === model.get( 'action' ) && true === this.site_icon.get( 'in_use' ) ) ||
+                                ( 'uploaded' === model.get( 'action' ) && model.get( 'url' ) !== this.site_icon.get( 'src' ) )
+                        ) {
+                                this.site_icon.set( 'in_use', false );
+                        }
+                }
+        };
+
+        // Main view
+        bp.Views.SiteIcon = bp.View.extend( {
+                tagName: 'div',
+                id: 'bp-site-icon',
+                template: bp.template( 'bp-avatar-site-icon' ),
+
+                events: {
+                        'click .avatar-crop-submit': 'setAvatar'
+                },
+
+                initialize: function() {
+                        // The site does not have an icon
+                        if ( true === this.model.get( 'no_icon' ) ) {
+                                bp.Avatar.displayWarning( BP_Uploader.strings.site_icon.noicon );
+
+                        // Message to inform the site icon can be used as an avatar
+                        } else if ( true === this.model.get( 'in_use' ) ) {
+                                bp.Avatar.displayWarning( BP_Uploader.strings.site_icon.set );
+
+                        } else {
+                                bp.Avatar.displayWarning( BP_Uploader.strings.site_icon.info );
+                        }
+                },
+
+                setAvatar: function( event ) {
+                        var self = this;
+
+                        event.preventDefault();
+
+                        // Remove the site icon view
+                        if ( ! _.isUndefined( bp.Avatar.views.get( 'site_icon' ) ) ) {
+                                var siteIconView = bp.Avatar.views.get( 'site_icon' );
+                                siteIconView.get( 'view' ).remove();
+                                bp.Avatar.views.remove( { id: 'site_icon', view: siteIconView } );
+                        }
+
+                        return wp.ajax.post( 'bp_avatar_set', {
+                                item_id:       self.model.get( 'item_id' ),
+                                object:        self.model.get( 'object' ),
+                                original_file: self.model.get( 'id' ),
+                                type:          'site_icon',
+                                nonce:         self.model.get( 'nonce' )
+                        } ).done( function( resp ) {
+                                self.model.set( 'in_use', true );
+
+                                var avatarStatus = new bp.Views.AvatarStatus( {
+                                        value : BP_Uploader.strings.site_icon[ resp.feedback_code ],
+                                        type : 'success'
+                                } );
+
+                                bp.Avatar.views.add( {
+                                        id   : 'status',
+                                        view : avatarStatus
+                                } );
+
+                                avatarStatus.inject( '.bp-avatar-status' );
+
+                                // Update each avatars of the page
+                                $( '.' + self.model.get( 'object' ) + '-' + self.model.get( 'item_id' ) + '-avatar' ).each( function() {
+                                        $( this ).prop( 'src', self.model.get( 'src' ) );
+                                } );
+
+                                // Show the delete nav
+                                bp.Avatar.navItems.get( 'delete' ).set( { hide: 0 } );
+
+                                // Update the Avatar Attachment object
+                                bp.Avatar.Attachment.set( _.extend(
+                                        _.pick( self.model.attributes, ['object', 'item_id'] ),
+                                        { url: self.model.get( 'src' ), action: 'uploaded' }
+                                ) );
+
+                        } ).fail( function( resp ) {
+
+                                var avatarStatus = new bp.Views.AvatarStatus( {
+                                        value : BP_Uploader.strings.site_icon[ resp.feedback_code ],
+                                        type : 'error'
+                                } );
+
+                                bp.Avatar.views.add( {
+                                        id   : 'status',
+                                        view : avatarStatus
+                                } );
+
+                                avatarStatus.inject( '.bp-avatar-status' );
+                        } );
+                }
+        } );
+
+        bp.Avatar.SiteIcon.start();
+
+} )( bp, jQuery );

src/bp-blogs/site/notifications.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site notifications.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSiteNotifications
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+// Put the code for the site notifications here!

src/bp-blogs/site/screens.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site screens.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSiteScreens
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Set the site screens comparing the URI with the Site's navigation.
+ * And eventually set the active primary an secondary nav items.
+ *
+ * This function is hooked to `bp_template_redirect` before `bp_redirect_canonical`
+ * as we need to eventually edit the BuddyPress canonical stack according the Site's
+ * navigation.
+ *
+ * @since  2.7.0
+ */
+function bp_blogs_set_site_screens() {
+        if ( ! bp_is_site() ) {
+                return;
+        }
+
+        // Get BuddyPress instance.
+        $bp = buddypress();
+
+        // Initialize the active nav
+        $active_nav = false;
+
+        // Default nav arguments are about primary nav.
+        $nav_args = array( 'slug' => bp_current_action() );
+
+        // If we have an action variable, it's a secondary nav.
+        if ( bp_action_variable( 0 ) ) {
+                $nav_args = array( 'parent_slug' => bp_current_action(), 'slug' => bp_action_variable( 0 ) );
+        }
+
+        // We need to try to get the corresponding primary nav item
+        if ( ! isset( $nav_args['parent_slug'] ) ) {
+                $active_nav = $bp->blogs->nav->get_primary( $nav_args, false );
+
+        // Or the one of the secondary nav
+        } else {
+                $active_nav = $bp->blogs->nav->get_secondary( $nav_args, false );
+        }
+
+        // No nav items matched. Redirect to Single site's home page.
+        if ( ! $active_nav ) {
+                if ( bp_is_current_item( bp_blogs_get_current_site_slug() ) ) {
+                        bp_core_add_message( __( 'The page you requested is not available.', 'buddypress' ), 'error' );
+                        bp_core_redirect( $bp->canonical_stack['base_url'] );
+                }
+
+                return;
+        }
+
+        // Get the matching screen function inside the active nav.
+        $nav_id          = join( '/', $nav_args );
+        $screen_function = $active_nav[ $nav_id ]->screen_function;
+
+        // If it's a secondary item nav, first check user has access to it
+        if ( ! empty( $active_nav[ $nav_id ]->parent_slug ) ) {
+                if ( ! $active_nav[ $nav_id ]->user_has_access ) {
+                        if ( ! is_user_logged_in() ) {
+                                bp_core_no_access();
+                        } elseif ( $active_nav[ $nav_id ]->no_access_url ) {
+                                bp_core_add_message( __( 'You must be an admin of the site to access the page you requested.', 'buddypress' ), 'error' );
+                                bp_core_redirect( $active_nav[ $nav_id ]->no_access_url );
+                        }
+
+                        return;
+                }
+
+                // Edit the parent nav to get it at the same time in order to eventually update the canonical stack.
+                $parent = bp_core_edit_nav_item( array(
+                        'component' => 'blogs',
+                        'slug'      => $active_nav[ $nav_id ]->parent_slug,
+                        'params'    => array(
+                                'item_css_class' => 'current selected',
+                        ),
+                ) );
+
+                if ( $parent->default_subnav_slug === $active_nav[ $nav_id ]->slug && ! bp_action_variable( 1 ) ) {
+                        array_shift( $bp->canonical_stack['action_variables'] );
+                }
+
+                // Finally edit the secondary item to set it as the active one.
+                bp_core_edit_nav_item( array(
+                        'component'   => 'blogs',
+                        'slug'        => $active_nav[ $nav_id ]->slug,
+                        'parent_slug' => $active_nav[ $nav_id ]->parent_slug,
+                        'params'      => array(
+                                'item_css_class' => 'current selected',
+                        ),
+                ) );
+
+        // It's a primary nav.
+        } else {
+                // Edit the primary nav to set it as the active one
+                bp_core_edit_nav_item( array(
+                        'component' => 'blogs',
+                        'slug'      => $active_nav[ $nav_id ]->slug,
+                        'params'    => array(
+                                'item_css_class' => 'current selected',
+                        ),
+                ) );
+
+                /**
+                 * If it's a primary item and there's no secondary item active,
+                 * set the default subnav slug as the first action variable.
+                 */
+                if ( ! empty( $active_nav[ $nav_id ]->default_subnav_slug ) && ! bp_action_variable( 0 ) ) {
+                        $bp->action_variables = array( $active_nav[ $nav_id ]->default_subnav_slug );
+
+                        // Edit the secondary nav to set the active one.
+                        bp_core_edit_nav_item( array(
+                                'component'   => 'blogs',
+                                'slug'        => $active_nav[ $nav_id ]->default_subnav_slug,
+                                'parent_slug' => $active_nav[ $nav_id ]->slug,
+                                'params'      => array(
+                                        'item_css_class' => 'current selected',
+                                ),
+                        ) );
+                }
+        }
+
+        // Finally hook the screen function.
+        if ( is_callable( $screen_function ) ) {
+                add_action( 'bp_screens', $screen_function, 3 );
+        }
+}
+add_action( 'bp_template_redirect', 'bp_blogs_set_site_screens', 1 );
+
+/**
+ * Screen function for the site's pages.
+ *
+ * @since  2.7.0
+ */
+function bp_blogs_screen_site_home() {
+        if ( ! bp_is_single_item() ) {
+                return false;
+        }
+
+        /**
+         * Hook here to run specific actions juste before
+         * a blog's single page is displayed
+         *
+         * @since 2.7.0
+         */
+        do_action( 'bp_blogs_screen_site_home' );
+
+        /**
+         * Filter here to edit the template part to use for the Single site's home.
+         *
+         * @since  2.7.0
+         *
+         * @param  string $value Relative path to the template part.
+         */
+        bp_core_load_template( apply_filters( 'bp_blogs_screen_site_home_template', 'blogs/single/home' ) );
+}
+
+/**
+ * Screen function for the site's manage pages.
+ *
+ * @since  2.7.0
+ */
+function bp_blogs_screen_site_manage() {
+        if ( ! bp_is_single_item() ) {
+                return false;
+        }
+
+        if ( bp_is_site_manage_settings() ) {
+
+                // Update settings.
+                if ( ! empty( $_POST['bp_site']['submit'] ) ) {
+
+                        check_admin_referer( 'site_manage_settings' );
+
+                        unset( $_POST['bp_site']['submit'] );
+                        $options = $_POST['bp_site'];
+
+                        $blog_id = bp_blogs_get_current_site_id();
+                        $referer = wp_unslash( $_POST['_wp_http_referer'] );
+                        $message = __( 'We were not able to perform this action, please try again later', 'buddypress' );
+                        $type    = 'error';
+                        $name_check = empty( $options['blogname'] );
+
+                        if ( ! bp_is_item_admin() || empty( $blog_id ) || $name_check ) {
+                                if ( $name_check ) {
+                                        $message = __( 'The site title is required.', 'buddypress' );
+                                }
+
+                                bp_core_add_message( $message, $type );
+                                bp_core_redirect( $referer );
+                        }
+
+                        if ( ! isset( $options['blog_public'] ) ) {
+                                $options['blog_public'] = 0;
+                        }
+
+                        // This option will only be saved in BuddyPress blog metas
+                        if ( isset( $options['disallow_subscriptions'] ) ) {
+                                bp_blogs_update_blogmeta( $blog_id, 'disallow_subscriptions', (int) $options['disallow_subscriptions'] );
+                                unset( $options['disallow_subscriptions'] );
+                        } else {
+                                bp_blogs_delete_blogmeta( $blog_id, 'disallow_subscriptions' );
+                        }
+
+                        $needs_switch = ! bp_is_root_blog( (int) $blog_id );
+
+                        if ( $needs_switch ) {
+                                switch_to_blog( $blog_id );
+                        }
+
+                        $whitelist_options = array(
+                                'blogname'        => true,
+                                'blogdescription' => true,
+                                'blog_public'     => true,
+                        );
+
+                        foreach ( $options as $key => $option ) {
+                                if ( empty( $whitelist_options[ $key ] ) ) {
+                                        continue;
+                                }
+
+                                $sanitized_option = sanitize_option( $key, $option );
+
+                                update_option( $key, $sanitized_option );
+                        }
+
+                        if ( isset( $needs_reset ) ) {
+                                restore_current_blog();
+                        }
+
+                        $options = array_diff_key( $options, $whitelist_options );
+
+                        // Now manage the options plugins can eventually add, if any.
+                        $plugin_settings = bp_blogs_get_site_settings();
+
+                        if ( ! empty( $plugin_settings ) ) {
+                                foreach ( $plugin_settings as $plugin_setting ) {
+                                        if ( empty( $plugin_setting->sanitize_function ) || ! is_callable( $plugin_setting->sanitize_function ) ) {
+                                                continue;
+                                        }
+
+                                        if ( isset( $options[ $plugin_setting->option_name ] ) ) {
+                                                $plugin_option = call_user_func_array( $plugin_setting->sanitize_function, array( $options[ $plugin_setting->option_name ] ) );
+
+                                                bp_blogs_update_blogmeta( $blog_id, $plugin_setting->option_name, $plugin_option );
+                                        } else {
+                                                bp_blogs_delete_blogmeta( $blog_id, $plugin_setting->option_name );
+                                        }
+                                }
+                        }
+
+                        // Redirect the user once done
+                        bp_core_add_message( __( 'Settings saved.', 'buddypress' ) );
+                        bp_core_redirect( $referer );
+                }
+
+        } elseif ( bp_is_site_manage_members() ) {
+
+                if ( 'remove' === bp_action_variable( 1 ) ) {
+                        check_admin_referer( 'site_remove_member' );
+
+                        $blog_id = bp_blogs_get_current_site_id();
+                        $user_id = (int) bp_action_variable( 2 );
+
+                        $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( $user_id, 'delete_published_posts', array( 'site_id' => $blog_id ) ) ) {
+                                $message = __( 'Only subscribers or contributors 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 2.7.0
+                         *
+                         * @param int $user_id the ID of the current user
+                         * @param int $blog_id the ID of the blog
+                         */
+                        do_action( 'bp_blogs_before_remove_user_from_site', $user_id, $blog_id );
+
+                        /**
+                         * Removing the user
+                         */
+                        $removed = remove_user_from_blog( $user_id, $blog_id );
+
+                        if ( ! is_wp_error( $removed ) ) {
+                                $message = __( 'Member successfully removed from the site.', 'buddypress' );
+                                $type    = '';
+
+                                /**
+                                 * Fires after the user was removed from the blog
+                                 *
+                                 * @since 2.7.0
+                                 *
+                                 * @param int $user_id the ID of the current user
+                                 * @param int $blog_id the ID of the blog
+                                 */
+                                do_action( 'bp_blogs_after_remove_user_from_site', $user_id, $blog_id );
+
+                        } else {
+                                $message = $removed->get_error_message();
+                                $type    = 'error';
+                        }
+
+                        bp_core_add_message( $message, $type );
+                        bp_core_redirect( $referer );
+
+                // Toggle involvement
+                } elseif ( 'promote' === bp_action_variable( 1 ) || 'demote' === bp_action_variable( 1 ) ) {
+                        $action = sanitize_key( bp_action_variable( 1 ) );
+
+                        check_admin_referer( "site_{$action}_member" );
+
+                        $blog_id = bp_blogs_get_current_site_id();
+                        $user_id = (int) bp_action_variable( 2 );
+
+                        $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 );
+                        }
+
+                        $needs_switch = ! bp_is_root_blog( (int) $blog_id );
+
+                        if ( $needs_switch ) {
+                                switch_to_blog( $blog_id );
+                        }
+
+                        if ( user_can( $user_id, 'delete_published_posts' ) ) {
+                                $message = __( 'Only subscribers or contributors can be managed from this screen. Please use your Site Administration to manage the role of this specific member.', 'buddypress' );
+                                bp_core_add_message( $message, $type );
+                                bp_core_redirect( $referer );
+                        }
+
+                        /**
+                         * Fires before the user is promoted or demoted
+                         *
+                         * @since 2.7.0
+                         *
+                         * @param int $user_id the ID of the current user
+                         * @param int $blog_id the ID of the blog
+                         */
+                        do_action( "bp_blogs_before_{$action}_user_from_site", $user_id, $blog_id );
+
+                        $message  = __( 'Member successfully promoted to contributor.', 'buddypress' );
+                        $userdata = array( 'ID' => $user_id, 'role' => 'contributor' );
+
+                        if ( 'demote' === $action ) {
+                                $message          = __( 'Member successfully demoted to subscriber.', 'buddypress' );
+                                $userdata['role'] = 'subscriber';
+                        }
+
+                        /**
+                         * Updating the user role
+                         */
+                        $updated = wp_update_user( $userdata );
+
+                        if ( $needs_switch ) {
+                                restore_current_blog();
+                        }
+
+                        if ( is_wp_error( $updated ) ) {
+                                $message = $updated->get_error_message();
+                                $type    = 'error';
+                        } else {
+                                $type = '';
+
+                                /**
+                                 * Fires after the user was promoted or demoted.
+                                 *
+                                 * @since 2.7.0
+                                 *
+                                 * @param int $user_id the ID of the current user
+                                 * @param int $blog_id the ID of the blog
+                                 */
+                                do_action( "bp_blogs_after_{$action}_user_from_site", $user_id, $blog_id );
+                        }
+
+                        bp_core_add_message( $message, $type );
+                        bp_core_redirect( $referer );
+                }
+        }
+
+        /**
+         * Hook here to run specific actions juste before
+         * a single site's settings page is displayed
+         *
+         * @since 2.7.0
+         */
+        do_action( 'bp_blogs_screen_site_manage' );
+
+        /**
+         * Filter here to edit the template part to use for the Single site's settings page.
+         *
+         * @since  2.7.0
+         *
+         * @param  string $value Relative path to the template part.
+         */
+        bp_core_load_template( apply_filters( 'bp_blogs_screen_site_manage_template', 'blogs/single/home' ) );
+}

src/bp-blogs/site/subscriptions.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site subscriptions.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSiteSubscriptions
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Displays a subscribe button for the current site.
+ *
+ * @since  2.7.0
+ *
+ * @param  WP_Site|object $site The site object.
+ * @return string HTML Output.
+ */
+function bp_site_subscribe_button( $site = null ) {
+        if ( empty( $site ) ) {
+                $site = bp_blogs_get_current_site();
+        }
+
+        echo bp_get_site_subscribe_button( $site );
+}
+
+/**
+ * Builds the arguments of the subscribe button for the current site.
+ *
+ * @since  2.7.0
+ *
+ * @param  WP_Site|object $site The site object.
+ * @return array The button arguments.
+ */
+function bp_get_site_subscribe_button_args( $site = null ) {
+        if ( empty( $site->blog_id ) ) {
+                $site = bp_blogs_get_current_site();
+        }
+
+        if ( ! $site || ! empty( $site->is_admin ) ) {
+                return;
+        }
+
+        $start_button = array(
+                'id'                => 'subscribe_unsubscribe',
+                'component'         => 'blogs',
+                'must_be_logged_in' => true,
+                'block_self'        => false,
+        );
+
+        if ( ! $site->is_member ) {
+                $end_button = array(
+                        'wrapper_class'     => 'site-button subscribe',
+                        'link_href'         => esc_url( wp_nonce_url(
+                                add_query_arg( 'action', 'subscribe', bp_blogs_get_site_community_url() ),
+                                'site_subscribe'
+                        ) ),
+                        'link_class'        => 'site-button subscribe',
+                        'link_text'         => __( 'Subscribe', 'buddypress' ),
+                );
+        } else {
+                $link_text = __( 'Unsubscribe', 'buddypress' );
+
+                // To avoid any confusion
+                if ( ! empty( $site->is_contributor ) ) {
+                        $link_text = __( 'Leave', 'buddypress' );
+                }
+
+                $end_button = array(
+                        'wrapper_class'     => 'site-button unsubscribe',
+                        'link_href'         => esc_url( wp_nonce_url(
+                                add_query_arg( 'action', 'unsubscribe', bp_blogs_get_site_community_url() ),
+                                'site_unsubscribe'
+                        ) ),
+                        'link_class'        => 'site-button unsubscribe confirm',
+                        'link_text'         => $link_text,
+                );
+        }
+
+        $button = array_merge( $start_button, $end_button );
+
+        /**
+         * Filter here to edit button arguments.
+         *
+         * @since  2.7.0
+         *
+         * @param  array  $button The Button arguments.
+         * @param  object $site   The site object.
+         */
+        return apply_filters( 'bp_get_site_subscribe_button_args', $button, $site );
+}
+
+/**
+ * Gets the Subscribe Button for the current site.
+ *
+ * @since  2.7.0
+ *
+ * @param  WP_Site|object $site The site object.
+ * @return string HTML Output.
+ */
+function bp_get_site_subscribe_button( $site = null ) {
+        return bp_get_button( bp_get_site_subscribe_button_args( $site ) );
+}
+
+/**
+ * Listen to the subscribe/unsubscribe actions and handle them.
+ *
+ * @since  2.7.0
+ */
+function bp_blogs_site_subscriptions_handle_actions() {
+        if ( empty( $_GET['action'] ) || ( 'subscribe' !== $_GET['action'] && 'unsubscribe' !== $_GET['action'] ) ) {
+                return;
+        }
+
+        $action = sanitize_key( $_GET['action'] );
+
+        check_admin_referer( 'site_' . $action );
+
+        $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_site_' . $action ) ) {
+                $result = call_user_func( 'bp_blogs_site_' . $action );
+        }
+
+        bp_core_add_message( $result['message'], $result['type'] );
+        bp_core_redirect( $referer );
+}
+add_action( 'bp_blogs_screen_site_home', 'bp_blogs_site_subscriptions_handle_actions' );
+
+/**
+ * Subscribes a user to a site.
+ *
+ * @since  2.7.0
+ *
+ * @param int $user_id The ID of the user.
+ * @param int $site_id The ID of the site.
+ * @return array       The feedback message and type.
+ */
+function bp_blogs_site_subscribe( $user_id = 0, $site_id = 0 ) {
+        if ( empty( $user_id ) ) {
+                $user_id = bp_loggedin_user_id();
+        }
+
+        if ( empty( $site_id ) ) {
+                $site = bp_blogs_get_current_site();
+        } else {
+                $site = bp_blogs_get_site( $site_id );
+        }
+
+        // Default result
+        $result = array(
+                'message' => __( 'We were not able to perform this action, please try again later', 'buddypress' ),
+                'type'    => 'error',
+        );
+
+        if ( bp_disable_site_subscriptions() || empty( $site->blog_id ) || empty( $site->public ) || ! empty( $site->disallow_subscriptions ) ) {
+                return $result;
+        }
+
+        // First make sure not to add a user that is already a subscriber of the blog.
+        if ( bp_user_can( $user_id, 'read', array( 'site_id' => $site->blog_id ) ) ) {
+                $result['message'] = __( 'You already subcribed to this site.', 'buddypress' );
+                return $result;
+        }
+
+        /**
+         * Fires before the user subcribes to the site.
+         *
+         * @since 2.7.0
+         *
+         * @param int            $user_id the ID of the user.
+         * @param WP_Site|object $site    The Site object.
+         */
+        do_action( 'bp_blogs_before_site_subscribe', $user_id, $site );
+
+        $subscribed = add_user_to_blog( $site->blog_id, $user_id, 'subscriber' );
+
+        if ( is_wp_error( $subscribed ) ) {
+                $result = array(
+                        'message' => $subscribed->get_error_message(),
+                        'type'    => 'error',
+                );
+        } else {
+                // Update Site object
+                $site->is_member = true;
+
+                $result = array(
+                        'message' => __( 'You successfully subscribed to the site.', 'buddypress' ),
+                        'type'    => '',
+                );
+
+                /**
+                 * Fires after the user subcribed to the site.
+                 *
+                 * @since 2.7.0
+                 *
+                 * @param int            $user_id the ID of the user.
+                 * @param WP_Site|object $site    The Site object.
+                 */
+                do_action( 'bp_blogs_after_site_subscribed', $user_id, $site );
+        }
+
+        return $result;
+}
+
+/**
+ * Unsubscribes a user to a site.
+ *
+ * @since  2.7.0
+ *
+ * @param int $user_id The ID of the user.
+ * @param int $site_id The ID of the site.
+ * @return array       The feedback message and type.
+ */
+function bp_blogs_site_unsubscribe( $user_id = 0, $site_id = 0 ) {
+        if ( empty( $user_id ) ) {
+                $user_id = bp_loggedin_user_id();
+        }
+
+        if ( empty( $site_id ) ) {
+                $site = bp_blogs_get_current_site();
+        } else {
+                $site = bp_blogs_get_site( $site_id );
+        }
+
+        // Default result
+        $result = array(
+                'message' => __( 'We were not able to perform this action, please try again later', 'buddypress' ),
+                'type'    => 'error',
+        );
+
+        if ( bp_disable_site_subscriptions() || empty( $site->blog_id ) || empty( $site->public ) || ! empty( $site->disallow_subscriptions ) ) {
+                return $result;
+        }
+
+        // First check the user is a subscriber.
+        if ( ! bp_user_can( $user_id, 'read', array( 'site_id' => $site->blog_id ) ) ) {
+                $result['message'] = __( 'You already unsubcribed to this site.', 'buddypress' );
+                return $result;
+        }
+
+        /**
+         * Fires before the user unsubscribes to the site.
+         *
+         * @since 2.7.0
+         *
+         * @param int            $user_id The ID of the user.
+         * @param WP_Site|object $site    The site object.
+         */
+        do_action( 'bp_blogs_before_site_unsubscribe', $user_id, $site );
+
+        $unsubscribed = remove_user_from_blog( $user_id, $site->blog_id );
+
+        if ( is_wp_error( $unsubscribed ) ) {
+                $result = array(
+                        'message' => $unsubscribed->get_error_message(),
+                        'type'    => 'error',
+                );
+        } else {
+                // Update Site object
+                $site->is_member = false;
+
+                $result = array(
+                        'message' => __( 'You successfully unsubscribed to the site.', 'buddypress' ),
+                        'type'    => 'success',
+                );
+
+                /**
+                 * Fires after the user unsubscribed to the site.
+                 *
+                 * @since 2.7.0
+                 *
+                 * @param int            $user_id The ID of the user.
+                 * @param WP_Site|object $site    The site object.
+                 */
+                do_action( 'bp_blogs_after_site_unsubscribed', $user_id, $site );
+        }
+
+        return $result;
+}
+

src/bp-blogs/site/template.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site template.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSiteTemplate
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/** Blogs loop template tags **************************************************/
+
+/**
+ * Output the site's slug in a Blogs loop.
+ *
+ * @since 2.7.0.
+ */
+function bp_blogs_site_slug() {
+        echo bp_get_blogs_site_slug();
+}
+
+        /**
+         * Return the site's slug in a Blogs loop.
+         *
+         * @since 2.7.0.
+         *
+         * @return $slug The site's slug.
+         */
+        function bp_get_blogs_site_slug() {
+                $slug = '';
+
+                if ( ! empty( $GLOBALS['blogs_template'] ) ) {
+                        $site = $GLOBALS['blogs_template']->blog;
+                }
+
+                if ( empty( $site->domain ) || empty( $site->path ) ) {
+                        return;
+                }
+
+                if ( (int) bp_get_root_blog_id() === (int) bp_get_blog_id() ) {
+                        $slug = bp_blogs_get_root_site_slug();
+                } elseif ( is_subdomain_install() ) {
+                        $slug = trim( str_replace( get_current_site()->domain, '', $site->domain ), '.' );
+                } else {
+                        $slug = trim( str_replace( get_current_site()->path, '', $site->path ), '/' );
+                }
+
+                return apply_filters( 'bp_get_blogs_site_slug', $slug, $site );
+        }
+
+/**
+ * Output the button to display the site's community page.
+ *
+ * @see BP_Button for a the description of arguments and return
+ *      value.
+ *
+ * @since  2.7.0
+ *
+ * @param array|string $args.
+ */
+function bp_blogs_site_discover_button( $args = '' ) {
+        echo bp_get_blogs_site_discover_button( $args );
+}
+
+        /**
+         * Get the arguments of the site's community button.
+         *
+         * @since  2.7.0
+         *
+         * @param  array|string $args
+         * @return array        The merged arguments.
+         */
+        function bp_blogs_get_site_discover_button_args( $args = '' ) {
+                $r = wp_parse_args( $args, array(
+                        'id'                => 'discover_site',
+                        'component'         => 'blogs',
+                        'must_be_logged_in' => false,
+                        'block_self'        => false,
+                        'wrapper_class'     => 'blog-button discover',
+                        'link_href'         => bp_blogs_get_site_community_url( bp_get_blogs_site_slug() ),
+                        'link_class'        => 'blog-button discover',
+                        'link_text'         => __( 'Discover Site', 'buddypress' ),
+                ) );
+
+                return apply_filters( 'bp_blogs_get_site_discover_button_args', $r );
+        }
+        /**
+         * Return button to display the site's community page.
+         *
+         * @see BP_Button for a the description of arguments and return
+         *      value.
+         *
+         * @since  2.7.0
+         *
+         * @param array|string $args
+         * @return string The HTML for the Visit button.
+         */
+        function bp_get_blogs_site_discover_button( $args = '' ) {
+                return bp_get_button( bp_blogs_get_site_discover_button_args( $args ) );
+        }
+
+/** Single Site template tags *************************************************/
+
+/**
+ * Load the appropriate current site's home page
+ *
+ * @since 2.7.0
+ *
+ * @param  bool           $require_once True to only include the template once. False otherwise.
+ * @param  WP_Site|object $site         The Site object.
+ */
+function bp_blogs_load_site_front_template( $require_once = false, $site = null ) {
+        $located = bp_blogs_get_site_front_template( $site );
+
+        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_current_site_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 site's custom front template if it exists.
+ *
+ * @since 2.7.0
+ *
+ * @param  WP_Site|object $site The Site object.
+ */
+function bp_blogs_get_site_front_template( $site = null ) {
+        if ( ! is_object( $site ) ) {
+                $site = bp_blogs_get_current_site();
+        }
+
+        if ( empty( $site->blog_id ) ) {
+                return false;
+        }
+
+        if ( isset( $site->front_template ) ) {
+                return $site->front_template;
+        }
+
+        $template_names = array(
+                'blogs/single/front-id-'   . sanitize_file_name( $site->blog_id ) . '.php',
+                'blogs/single/front-slug-' . sanitize_file_name( $site->slug )    . '.php',
+        );
+
+        $visibility = 'public';
+        if ( ! $site->public ) {
+                $visibility = 'private';
+        }
+
+        $template_names = array_merge( $template_names, array(
+                'blogs/single/front-visibility-' . $visibility . '.php',
+                'blogs/single/front.php'
+        ) );
+
+        /**
+         * Filters the hierarchy of the site's front template.
+         *
+         * @since 2.7.0
+         *
+         * @param array          $template_names Array of template paths.
+         * @param WP_Site|object $site           Site object.
+         */
+        return bp_locate_template( apply_filters( 'bp_blogs_get_site_front_template', $template_names, $site ), false, true );
+}
+
+/**
+ * Generic function to get the output for a primary or a secondary nav.
+ *
+ * @since  2.7.0
+ *
+ * @param  string $type Primary or Secondary?
+ * @return array        List of li elements for the navigation.
+ */
+function bp_get_site_nav( $type = 'primary' ) {
+        $bp = buddypress();
+
+        if ( 'secondary' === $type ) {
+                $parent_slug = bp_current_action();
+                $nav_items = $bp->blogs->nav->get_secondary( array( 'parent_slug' => $parent_slug ) );
+        } else {
+                $nav_items = $bp->blogs->nav->get_primary();
+        }
+
+        if ( empty( $nav_items ) ) {
+                return;
+        }
+
+        $output = array();
+
+        foreach ( $nav_items as $nav_item ) {
+                $selected = '';
+
+                if ( ! empty( $nav_item->item_css_class ) ) {
+                        $selected = ' class="' . esc_attr( $nav_item->item_css_class ) . '"';
+                }
+
+                $output[ $nav_item->slug ] = sprintf( '
+                        <li id="%1$s-blogs-li"%2$s>
+                                <a href="%3$s" id="site-%1$s">%4$s</a>
+                        </li>
+                        ',
+                        esc_attr( $nav_item->css_id ),
+                        $selected,
+                        esc_url( $nav_item->link ),
+                        wp_kses( $nav_item->name, array( 'span' => array( 'class' => true ) ) )
+                );
+        }
+
+        return apply_filters( 'bp_get_site_nav', $output, $nav_items, $type );
+}
+
+/**
+ * Output the Site's primary nav.
+ *
+ * @since  2.7.0
+ *
+ * @return string HTML Output.
+ */
+function bp_site_primary_nav() {
+        /**
+         * Fires before the site primary nav
+         *
+         * (inside an <ul> tag)
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_before_site_primary_nav' );
+
+        echo join( "\n", bp_get_site_nav( 'primary' ) );
+
+        /**
+         * Fires after the site primary nav
+         *
+         * (inside an <ul> tag)
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_after_site_primary_nav' );
+}
+
+/**
+ * Output the Site's secondary nav.
+ *
+ * @since  2.7.0
+ *
+ * @return string HTML Output.
+ */
+function bp_site_secondary_nav() {
+        /**
+         * Fires before the site secondary nav
+         *
+         * (inside an <ul> tag)
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_before_site_secondary_nav' );
+
+        echo join( "\n", bp_get_site_nav( 'secondary' ) );
+
+        /**
+         * Fires after the site secondary nav
+         *
+         * (inside an <ul> tag)
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_after_site_secondary_nav' );
+}
+
+/**
+ * Does the current user has access to this site?
+ *
+ * @since  2.7.0
+ *
+ * @return bool True if the user has access. False otherwise.
+ */
+function bp_site_has_access() {
+        return bp_blogs_current_site_has_access();
+}
+
+/**
+ * Is the current site public?
+ *
+ * @since  2.7.0
+ *
+ * @return bool True if the site is public. False otherwise.
+ */
+function bp_site_is_public() {
+        return bp_blogs_current_site_is_public();
+}
+
+/**
+ * Prints a message if the user has no access to the blog's content
+ *
+ * @since 2.7.0
+ */
+function bp_site_visibility_message() {
+        $message = false;
+
+        // For now display a message if the blog is not public
+        if ( ! bp_blogs_current_site_is_public() ) {
+                $message = __( 'The details of this site are restricted to its members.', 'buddypress' );
+        }
+
+        /**
+         * Filters a message if the blog is not public.
+         *
+         * @since 2.7.0
+         *
+         * @param string $message Message to display to the current user.
+         */
+        echo esc_html( apply_filters( 'bp_site_visibility_message', $message ) );
+}
+
+/**
+ * Display the site name.
+ *
+ * @since  2.7.0
+ *
+ * @return string The site name.
+ */
+function bp_sitename() {
+        echo bp_get_sitename();
+}
+
+        /**
+         * Get the site name to display.
+         *
+         * @since  2.7.0
+         *
+         * @return string The site name.
+         */
+        function bp_get_sitename() {
+                return apply_filters( 'bp_get_sitename', bp_blogs_get_current_site_property( 'name' ) );
+        }
+
+/**
+ * Display the site description.
+ *
+ * @since  2.7.0
+ *
+ * @return string The site name.
+ */
+function bp_site_description() {
+        /**
+         * Fires before the site description
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_before_site_description' );
+
+        echo bp_get_site_description();
+
+        /**
+         * Fires after the site description
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_after_site_description' );
+}
+
+/**
+ * Get the site description to display.
+ *
+ * @since  2.7.0
+ *
+ * @return string The site description.
+ */
+function bp_get_site_description() {
+        return apply_filters( 'bp_get_site_description', bp_blogs_get_current_site_property( 'description' ) );
+}
+
+/**
+ * Display the site's avatar
+ *
+ * @since  2.7.0
+ *
+ * @return string The site's avatar.
+ */
+function bp_site_avatar() {
+        echo bp_blogs_get_site_avatar( array(
+                'item_id'   => bp_blogs_get_current_site_id(),
+                'type'      => 'full',
+                'site_name' => esc_attr( bp_get_sitename() ),
+        ) );
+}
+
+/**
+ * Display the admins in the site's header
+ *
+ * @since 2.7.0
+ *
+ * @return string HTML output
+ */
+function bp_site_list_admins() {
+        /**
+         * Fires before the site admins list
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_before_site_list_admins' );
+
+        echo bp_get_site_list_admins();
+
+        /**
+         * Fires after the site admins list
+         *
+         * @since  2.7.0
+         */
+        do_action( 'bp_after_site_list_admins' );
+}
+        /**
+         * Get the admins list
+         *