Ticket #6026: 6026.smaller-steps.01.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-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-functions.php

@@ -303 +303 @@
  */
 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 +331 @@
                 $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 +359 @@
         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.
@@ -800 +845 @@
                 }
         }
 
-        // 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 );
 
 /**
  * The allowed blog roles a member must have to be recorded into the
@@ -820 +875 @@
  * 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 );
 }
 
 /**

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';
+
+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/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 ) );
+                }
+
+                if ( empty( $blog ) ) {
+                        $this->id = 0;
+                        return;
+                }
 
-                $this->user_id = $blog->user_id;
-                $this->blog_id = $blog->blog_id;
+                $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.
@@ -164 +193 @@
          *               '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();
-
-                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 = '';
+                // 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'] );
+                }
 
-                $pag_sql = ( $limit && $page ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
+                if ( $limit && $page ) {
+                        $query_vars = array_merge( $query_vars, array(
+                                'offset' => (int) ( ( $page - 1 ) * $limit ),
+                                'number' => (int) $limit,
+                        ) );
+                }
 
-                $user_sql = !empty( $user_id ) ? $wpdb->prepare( " AND b.user_id = %d", $user_id ) : '';
+                if ( ! empty( $user_id ) ) {
+                        $query_vars['user_id'] = (int) $user_id;
+                }
 
                 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['only_contributors'] ) ) {
+                                $sql['where']['is_contributor'] = 'b.is_contributor = 1';
+                        } else {
+                                $sql['where']['is_contributor'] = $wpdb->prepare( 'b.is_contributor = %d', $query_vars['only_contributors'] );
+                        }
+                }
+
+                // 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 +422 @@
         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 +457 @@
          * 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 +509 @@
          *
          * 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 ),
+                );
+
+                if ( ! is_null( $is_contributor ) ) {
+                        $where['is_contributor'] = $wpdb->prepare( 'is_contributor = %d', $is_contributor );
+                }
 
-                return $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$bp->blogs->table_name} WHERE user_id = %d", $user_id ) );
+                $where = join( ' AND ', $where );
+
+                return $wpdb->get_col( "SELECT blog_id FROM {$bp->blogs->table_name} WHERE {$where}" );
         }
 
         /**
@@ -389 +561 @@
          * $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 +635 @@
          * 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 +688 @@
 
                 $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 +719 @@
          * @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;
+                                }
                         }
                 }
 

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' ),
                         )
                 );
         }
@@ -137 +138 @@
 
                 if ( is_multisite() ) {
                         $includes[] = 'widgets';
+
+                        // Conditional includes
+                        if ( bp_is_active( $this->id, 'site' ) ) {
+                                $includes[] = 'site';
+                        }
                 }
 
                 // Include the files.

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 );
+
+                // 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,
+                ) );
+
+                // 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'] ) ) {
+                        $user_sites = BP_BLOGS_BLOG::get_blog_ids_for_user( $this->query_vars['user_id'] );
+
+                        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'] = wp_parse_id_list( $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 ( empty( $this->query_vars['single_site'] ) ) {
+                                        $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'] ) && isset( $buddypress_orders[$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 *****************************************************/
+
+                // 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;
+
+// Put the code for the site activity here!

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/functions.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Blogs Site functions.
+ *
+ * @package BuddyPress
+ * @subpackage BlogsSiteFunctions
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * 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;
+        } elseif ( is_subdomain_install() ) {
+                $query_vars['domain__in'] = array( $slug . '.' . get_current_site()->domain );
+        } else {
+                $query_vars['path__in'] = array( '/' . $slug . '/' );
+        }
+
+        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;
+        }
+
+        return reset( $result['blogs'] );
+}

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;
+
+// Put the code for the site screens here!

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;
+
+// Put the code for the front-end site subscriptions feature here!

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;
+
+// Put the code for the site template here!

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

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

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

@@ -249 +249 @@
 <?php
 }
 
+/** Blogs Section *************************************************************/
+
+/**
+ * Blogs settings section description for the settings page.
+ *
+ * @since 2.7.0
+ */
+function bp_admin_setting_callback_blogs_section() { }
+
+/**
+ * Disable front-end site subscriptions.
+ *
+ * @since 2.7.0
+ *
+ */
+function bp_admin_setting_callback_blog_subscriptions() {
+?>
+
+        <input id="bp-disable-site-subscriptions" name="bp-disable-site-subscriptions" type="checkbox" value="1" <?php checked( ! bp_disable_site_subscriptions() ); ?> />
+        <label for="bp-disable-site-subscriptions"><?php _e( 'Allow members to subscribe to sites from their front-end presentation page.', 'buddypress' ); ?></label>
+
+<?php
+}
+
 /** Settings Page *************************************************************/
 
 /**
@@ -316 +340 @@
                         'bp-disable-group-avatar-uploads',
                         'bp-disable-group-cover-image-uploads',
                         'bp_disable_blogforum_comments',
+                        'bp-disable-site-subscriptions',
                         'bp-disable-profile-sync',
                         'bp_restrict_group_creation',
                         'hide-loggedout-adminbar',

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

@@ -70 +70 @@
                 // Allow comments on blog and forum activity items.
                 'bp-disable-blogforum-comments'        => true,
 
+                // Disallow members to subscribe to sites.
+                'bp-disable-site-subscriptions'        => false,
+
                 // The ID for the current theme package.
                 '_bp_theme_package_id'                 => 'legacy',
 
@@ -696 +699 @@
 }
 
 /**
+ * Is subscribing to sites allowed to members of the network?
+ *
+ * @since  2.7.0
+ *
+ * @param  bool $default Optional. Fallback value if not found in the database.
+ *                       Default: false.
+ * @return bool True if site subscriptions are disabled for members of the network.
+ *              False otherwise.
+ */
+function bp_disable_site_subscriptions( $default = false ) {
+
+        /**
+         * Filters whether or not members can subscibe to sites from the front-end.
+         *
+         * @since 1.6.0
+         *
+         * @param bool $value Whether or not front-end site subscriptions are disabled.
+         */
+        return (bool) apply_filters( 'bp_disable_site_subscriptions', (bool) bp_get_option( 'bp-disable-site-subscriptions', $default ) );
+}
+
+/**
  * Is group creation turned off?
  *
  * @since 1.6.0

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

@@ -265 +265 @@
                 }
 
                 // Version 2.7.0.
-                if ( $raw_db_version < 10940 ) {
+                if ( $raw_db_version < 10952 ) {
                         bp_update_to_2_7();
                 }
         }
@@ -513 +513 @@
  */
 function bp_update_to_2_7() {
         bp_add_option( 'bp-emails-unsubscribe-salt', base64_encode( wp_generate_password( 64, true, true ) ) );
+
+        if ( bp_is_active( 'blogs' ) ) {
+                bp_core_install_blog_tracking();
+        }
 }
 
 /**

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

@@ -473 +473 @@
                                 register_setting( 'buddypress', '_bp_enable_akismet', 'intval' );
                         }
                 }
+
+                if ( bp_is_active( 'blogs', 'site' ) ) {
+                        // Add the main section.
+                        add_settings_section( 'bp_blogs', __( 'Sites Settings', 'buddypress' ), 'bp_admin_setting_callback_blogs_section', 'buddypress' );
+
+                        // Activity commenting on blog and forum posts.
+                        add_settings_field( 'bp-disable-site-subscriptions', __( 'Site subscriptions.', 'buddypress' ), 'bp_admin_setting_callback_blog_subscriptions', 'buddypress', 'bp_blogs' );
+                        register_setting( 'buddypress', 'bp-disable-site-subscriptions', 'intval' );
+                }
         }
 
         /**

src/bp-loader.php

@@ -331 +331 @@
                 /** Versions **********************************************************/
 
                 $this->version    = '2.7-alpha';
-                $this->db_version = 10469;
+                $this->db_version = 10952;
 
                 /** Loading ***********************************************************/
 
@@ -593 +593 @@
                         'BP_Signup'                      => 'members',
                 );
 
+                if ( function_exists( 'get_sites' ) ) {
+                        $irregular_map['BP_Site_Query'] = 'blogs';
+                }
+
                 $component = null;
 
                 // First check to see if the class is one without a properly namespaced name.

tests/phpunit/subdomains-multisite.xml

@@ +1 @@
+<phpunit
+        bootstrap="bootstrap.php"
+        backupGlobals="false"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        >
+        <php>
+                <const name="WP_TESTS_MULTISITE" value="1" />
+                <const name="SUBDOMAIN_INSTALL" value="true" />
+        </php>
+        <testsuites>
+                <testsuite>
+                        <directory suffix=".php">./testcases/</directory>
+                </testsuite>
+        </testsuites>
+</phpunit>
+ No newline at end of file

tests/phpunit/testcases/blogs/activity.php

@@ -200 +200 @@
 
         /**
          * @group bp_blogs_format_activity_action_new_blog
+         * @group multisite
          */
         public function test_bp_activity_format_activity_action_new_blog_backpat() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
-
                 add_filter( 'bp_blogs_activity_created_blog_action', array( $this, 'created_blog_passthrough' ), 10, 2 );
 
                 $b = $this->factory->blog->create();
                 $u = $this->factory->user->create();
 
-                $recorded_blog          = new BP_Blogs_Blog;
-                $recorded_blog->user_id = $u;
-                $recorded_blog->blog_id = $b;
-                $recorded_blog_id       = $recorded_blog->save();
+                $recorded_blog                 = new BP_Blogs_Blog;
+                $recorded_blog->user_id        = $u;
+                $recorded_blog->blog_id        = $b;
+                $recorded_blog->is_contributor = 1;
+                $recorded_blog_id              = $recorded_blog->save();
 
                 $a = $this->factory->activity->create( array(
                         'component' => buddypress()->blogs->id,

tests/phpunit/testcases/blogs/cache.php

@@ -3 +3 @@
 /**
  * @group blogs
  * @group cache
+ * @group multisite
  */
 class BP_Tests_Blogs_Cache extends BP_UnitTestCase {
         /**
          * @group bp_blogs_update_meta_cache
          */
         public function test_bp_blogs_update_meta_cache() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
-
                 $b1 = $this->factory->blog->create();
                 $b2 = $this->factory->blog->create();
 
@@ -90 +87 @@
          * @group bp_has_blogs
          */
         public function test_bp_blogs_update_meta_cache_bp_has_blogs() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
-
                 $u = $this->factory->user->create();
 
                 // Switch user so we have access to non-public blogs
@@ -184 +177 @@
          * @group bp_has_blogs
          */
         public function test_bp_blogs_update_meta_cache_bp_has_blogs_false() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
-
                 $u = $this->factory->user->create();
 
                 // Switch user so we have access to non-public blogs
@@ -237 +226 @@
          * @group counts
          */
         public function test_bp_blogs_total_count_should_respect_cached_value_of_0() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
-
                 global $wpdb;
 
                 // prime cache
@@ -259 +244 @@
          * @group bp_blogs_total_blogs
          */
         public function test_bp_blogs_total_blogs_count_after_delete_blog() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
-
                 $u = $this->factory->user->create();
 
                 // need to make sure we set the 'public' flag due to how BP_Blogs_Blogs:get_all() works
                 $b1 = $this->factory->blog->create( array(
-                        'meta' => array(
+                        'user_id' => $u,
+                        'meta'    => array(
                                 'public' => 1
                         )
                 ) );
                 $b2 = $this->factory->blog->create( array(
-                        'meta' => array(
+                        'user_id' => $u,
+                        'meta'    => array(
                                 'public' => 1
                         )
                 ) );
@@ -293 +276 @@
          * @group update_blog_details
          */
         public function test_update_blog_details_should_purge_blogmeta_cache() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
-
                 $u = $this->factory->user->create();
 
                 $b1 = $this->factory->blog->create();

tests/phpunit/testcases/blogs/class-bp-blogs-blog.php

@@ -3 +3 @@
 /**
  * @group blogs
  * @group BP_Blogs_Blog
+ * @group multisite
  */
 class BP_Tests_BP_Blogs_Blog_TestCases extends BP_UnitTestCase {
-        public function test_get_with_search_terms() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
+        public function setUp() {
+                parent::setUp();
+
+                $this->test_legacy = function_exists( 'get_sites' );
+
+                $this->old_user     = get_current_user_id();
+                $this->current_user = $this->factory->user->create();
+
+                $this->set_current_user( $this->current_user );
+
+                $this->blogs = array(
+                        'foobar' => $this->factory->blog->create( array(
+                                'title' => 'Foo Bar Blog',
+                                'user_id' => $this->current_user,
+                                'path' => '/path' . rand() . time() . '/',
+                        ) ),
+                        'barfoo' => $this->factory->blog->create( array(
+                                'title' => 'Bar foo Blog',
+                                'user_id' => $this->current_user,
+                                'path' => '/path' . rand() . time() . '/',
+                        ) ),
+                );
+        }
 
-                $old_user = get_current_user_id();
+        public function tearDown() {
+                parent::tearDown();
 
-                $u = $this->factory->user->create();
-                $this->set_current_user( $u );
-                $b = $this->factory->blog->create( array(
-                        'title' => 'The Foo Bar Blog',
-                        'user_id' => $u,
-                ) );
+                $this->set_current_user( $this->old_user );
+        }
+
+        public function test_get_with_search_terms() {
                 bp_blogs_record_existing_blogs();
 
                 // make the blog public or it won't turn up in generic results
-                update_blog_option( $b, 'blog_public', '1' );
+                update_blog_option( $this->blogs['foobar'], 'blog_public', '1' );
 
-                $blogs = BP_Blogs_Blog::get( 'active', false, false, 0, 'Foo' );
+                $blogs = BP_Blogs_Blog::get( 'active', false, false, 0, 'Foo Bar' );
                 $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
 
-                $this->assertEquals( array( $b ), $blog_ids );
+                $this->assertEquals( array( $this->blogs['foobar'] ), $blog_ids );
+
+                if ( $this->test_legacy ) {
+                        add_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+
+                        $blogs = BP_Blogs_Blog::get( 'active', false, false, 0, 'Foo Bar' );
+                        $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+
+                        $this->assertEquals( array( $this->blogs['foobar'] ), $blog_ids );
+
+                        remove_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+                }
         }
 
         /**
          * @ticket BP5858
          */
         public function test_get_with_search_terms_should_match_description() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
-
-                $old_user = get_current_user_id();
-
-                $u = $this->factory->user->create();
-                $this->set_current_user( $u );
-                $b = $this->factory->blog->create( array(
-                        'title' => 'The Foo Bar Blog',
-                        'domain' => __METHOD__,
-                        'user_id' => $u,
-                ) );
-                update_blog_option( $b, 'blogdescription', 'Full of foorificness' );
+                update_blog_option( $this->blogs['foobar'], 'blogdescription', 'Full of foorificness' );
                 bp_blogs_record_existing_blogs();
 
                 // make the blog public or it won't turn up in generic results
-                update_blog_option( $b, 'blog_public', '1' );
+                update_blog_option( $this->blogs['foobar'], 'blog_public', '1' );
 
                 $blogs = BP_Blogs_Blog::get( 'active', false, false, 0, 'Full' );
                 $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
 
-                $this->assertEquals( array( $b ), $blog_ids );
+                $this->assertEquals( array( $this->blogs['foobar'] ), $blog_ids );
                 $this->assertEquals( 1, $blogs['total'] );
-        }
 
-        public function test_search_blogs() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
+                if ( $this->test_legacy ) {
+                        add_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
 
-                $old_user = get_current_user_id();
+                        $blogs = BP_Blogs_Blog::get( 'active', false, false, 0, 'Full' );
+                        $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
 
-                $u = $this->factory->user->create();
-                $this->set_current_user( $u );
-                $b = $this->factory->blog->create( array(
-                        'title' => 'The Foo Bar Blog',
-                        'user_id' => $u,
-                        'path' => '/path' . rand() . time() . '/',
-                ) );
+                        $this->assertEquals( array( $this->blogs['foobar'] ), $blog_ids );
+                        $this->assertEquals( 1, $blogs['total'] );
+
+                        remove_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+                }
+        }
+
+        public function test_search_blogs() {
                 bp_blogs_record_existing_blogs();
 
                 // make the blog public or it won't turn up in generic results
-                update_blog_option( $b, 'blog_public', '1' );
+                update_blog_option( $this->blogs['foobar'], 'blog_public', '1' );
 
-                $blogs = BP_Blogs_Blog::search_blogs( 'Foo' );
+                $blogs = BP_Blogs_Blog::search_blogs( 'Foo Bar' );
                 $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
 
-                $this->assertEquals( array( $b ), $blog_ids );
+                $this->assertEquals( array( $this->blogs['foobar'] ), $blog_ids );
         }
 
         /**
          * @group get_by_letter
          */
         public function test_get_by_letter() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
-
-                $old_user = get_current_user_id();
-
-                $u = $this->factory->user->create();
-                $this->set_current_user( $u );
-                $b = $this->factory->blog->create( array(
-                        'title' => 'Foo Bar Blog',
-                        'user_id' => $u,
-                        'path' => '/path' . rand() . time() . '/',
-                ) );
                 bp_blogs_record_existing_blogs();
 
                 // make the blog public or it won't turn up in generic results
-                update_blog_option( $b, 'blog_public', '1' );
+                update_blog_option( $this->blogs['foobar'], 'blog_public', '1' );
 
                 $blogs = BP_Blogs_Blog::get_by_letter( 'F' );
                 $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
 
-                $this->assertEquals( array( $b ), $blog_ids );
+                $this->assertEquals( array( $this->blogs['foobar'] ), $blog_ids );
         }
 
         /**
          * @group get_order_by
          */
-        public function test_get_order_by() {
-                if ( ! is_multisite() ) {
-                        return;
+        public function test_get_order_by_alphabetical() {
+                bp_blogs_record_existing_blogs();
+
+                // make the blog public or it won't turn up in generic results
+                foreach ( $this->blogs as $b ) {
+                        update_blog_option( $b, 'blog_public', '1' );
                 }
 
-                $old_user = get_current_user_id();
+                // Used to make sure barfoo is older than foobar
+                $b_time = date_i18n( 'Y-m-d H:i:s', strtotime( '-5 minutes' ) );
 
-                $u = $this->factory->user->create();
-                $this->set_current_user( $u );
-                $bs = array(
-                        'foobar' => $this->factory->blog->create( array(
-                                'title' => 'Foo Bar Blog',
-                                'user_id' => $u,
-                                'path' => '/path' . rand() . time() . '/',
-                        ) ),
-                        'barfoo' => $this->factory->blog->create( array(
-                                'title' => 'Bar foo Blog',
-                                'user_id' => $u,
-                                'path' => '/path' . rand() . time() . '/',
-                        ) ),
-                );
+                /* Alphabetical */
+                $blogs = BP_Blogs_Blog::get( 'alphabetical', false, false, $this->current_user );
+                $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+                $this->assertEquals( array( $this->blogs['barfoo'], $this->blogs['foobar'] ), $blog_ids );
 
+                if ( $this->test_legacy ) {
+                        add_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+
+                        $blogs = BP_Blogs_Blog::get( 'alphabetical', false, false, $this->current_user );
+                        $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+                        $this->assertEquals( array( $this->blogs['barfoo'], $this->blogs['foobar'] ), $blog_ids );
+
+                        remove_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+                }
+        }
+
+        /**
+         * @group get_order_by
+         */
+        public function test_get_order_by_newest() {
                 bp_blogs_record_existing_blogs();
 
                 // make the blog public or it won't turn up in generic results
-                foreach ( $bs as $b ) {
+                foreach ( $this->blogs as $b ) {
                         update_blog_option( $b, 'blog_public', '1' );
                 }
 
                 // Used to make sure barfoo is older than foobar
                 $b_time = date_i18n( 'Y-m-d H:i:s', strtotime( '-5 minutes' ) );
 
-                /* Alphabetical */
-                $blogs = BP_Blogs_Blog::get( 'alphabetical', false, false, $u );
-                $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
-                $this->assertEquals( array( $bs['barfoo'], $bs['foobar'] ), $blog_ids );
-
                 /* Newest */
-                update_blog_details( $bs['barfoo'], array( 'registered' => $b_time ) );
-                $blogs = BP_Blogs_Blog::get( 'newest', false, false, $u );
+                update_blog_details( $this->blogs['barfoo'], array( 'registered' => $b_time ) );
+
+                $blogs = BP_Blogs_Blog::get( 'newest', false, false, $this->current_user );
                 $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
-                $this->assertEquals( array( $bs['foobar'], $bs['barfoo'] ), $blog_ids );
+                $this->assertEquals( array( $this->blogs['foobar'], $this->blogs['barfoo'] ), $blog_ids );
+
+                if ( $this->test_legacy ) {
+                        add_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+
+                        $blogs = BP_Blogs_Blog::get( 'newest', false, false, $this->current_user );
+                        $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+                        $this->assertEquals( array( $this->blogs['foobar'], $this->blogs['barfoo'] ), $blog_ids );
+
+                        remove_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+                }
+        }
+
+        /**
+         * @group get_order_by
+         */
+        public function test_get_order_by_active() {
+                bp_blogs_record_existing_blogs();
+
+                // make the blog public or it won't turn up in generic results
+                foreach ( $this->blogs as $b ) {
+                        update_blog_option( $b, 'blog_public', '1' );
+                }
+
+                // Used to make sure barfoo is older than foobar
+                $b_time = date_i18n( 'Y-m-d H:i:s', strtotime( '-5 minutes' ) );
 
                 /* Active */
-                bp_blogs_update_blogmeta( $bs['barfoo'], 'last_activity', $b_time );
-                $blogs = BP_Blogs_Blog::get( 'active', false, false, $u );
+                bp_blogs_update_blogmeta( $this->blogs['barfoo'], 'last_activity', $b_time );
+
+                $blogs = BP_Blogs_Blog::get( 'active', false, false, $this->current_user );
                 $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
-                $this->assertEquals( array( $bs['foobar'],$bs['barfoo'] ), $blog_ids );
+                $this->assertEquals( array( $this->blogs['foobar'], $this->blogs['barfoo'] ), $blog_ids );
+
+                if ( $this->test_legacy ) {
+                        add_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+
+                        $blogs = BP_Blogs_Blog::get( 'active', false, false, $this->current_user );
+                        $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+                        $this->assertEquals( array( $this->blogs['foobar'], $this->blogs['barfoo'] ), $blog_ids );
+
+                        remove_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+                }
+        }
+
+        /**
+         * @group get_order_by
+         */
+        public function test_get_order_by_random() {
+                bp_blogs_record_existing_blogs();
+
+                // make the blog public or it won't turn up in generic results
+                foreach ( $this->blogs as $b ) {
+                        update_blog_option( $b, 'blog_public', '1' );
+                }
 
                 /* Random */
-                $blogs = BP_Blogs_Blog::get( 'random', false, false, $u );
+                $blogs = BP_Blogs_Blog::get( 'random', false, false, $this->current_user );
                 $this->assertTrue( 2 == count( $blogs['blogs'] ) );
 
-                $this->set_current_user( $old_user );
+                if ( $this->test_legacy ) {
+                        add_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+
+                        $blogs = BP_Blogs_Blog::get( 'random', false, false, $this->current_user );
+                        $this->assertTrue( 2 == count( $blogs['blogs'] ) );
+
+                        remove_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+                }
         }
 }

tests/phpunit/testcases/blogs/functions.php

@@ -281 +281 @@
 
         /**
          * @group bp_blogs_restore_data
+         * @group multisite
          */
         public function test_bp_blogs_restore_data() {
-                if ( ! is_multisite() ) {
-                        return;
-                }
-
                 // Create a regular member
                 $u = $this->factory->user->create();
 

tests/phpunit/testcases/blogs/site.php

@@ +1 @@
+<?php
+
+/**
+ * @group site
+ * @group multisite
+ */
+class BP_Tests_Blogs_Site_TestCases extends BP_UnitTestCase {
+        public function setUp() {
+                parent::setUp();
+
+                $this->test_legacy = function_exists( 'get_sites' );
+
+                $this->old_user     = get_current_user_id();
+                $this->current_user = $this->factory->user->create();
+                $this->other_user   = $this->factory->user->create();
+
+                $this->sites = array(
+                        'foo'     => array( 'domain' => WP_TESTS_DOMAIN, 'path' => '/foobar/', 'user_id' => $this->current_user, 'title' => 'Foo Bar' ),
+                        'bar'     => array( 'domain' => WP_TESTS_DOMAIN, 'path' => '/barfoo/', 'user_id' => $this->other_user,   'title' => 'Bar Foo' ),
+                        'taz'     => array( 'domain' => WP_TESTS_DOMAIN, 'path' => '/tazfoo/', 'user_id' => $this->current_user, 'title' => 'Taz Foo', 'meta' => array( 'public' => 0 ) ),
+                        'private' => array( 'domain' => WP_TESTS_DOMAIN, 'path' => '/private/', 'user_id' => $this->other_user, 'meta' => array( 'public' => 0 ) ),
+                );
+
+                if ( is_subdomain_install() ) {
+                        $this->sites = array(
+                                'foo'     => array( 'domain' => 'foobar.' . WP_TESTS_DOMAIN, 'path' => '/', 'user_id' => $this->current_user, 'title' => 'Foo Bar' ),
+                                'bar'     => array( 'domain' => 'barfoo.' . WP_TESTS_DOMAIN, 'path' => '/', 'user_id' => $this->other_user,   'title' => 'Bar Foo' ),
+                                'taz'     => array( 'domain' => 'tazfoo.' . WP_TESTS_DOMAIN, 'path' => '/', 'user_id' => $this->current_user, 'title' => 'Taz Foo', 'meta' => array( 'public' => 0 ) ),
+                                'private' => array( 'domain' => 'private.' . WP_TESTS_DOMAIN, 'path' => '/', 'user_id' => $this->other_user, 'meta' => array( 'public' => 0 ) ),
+                        );
+                }
+
+                foreach ( $this->sites as $key => $site ) {
+                        $this->sites[ $key ]['id'] = $this->factory->blog->create( $site );
+                }
+
+                $this->set_current_user( $this->current_user );
+        }
+
+        public function tearDown() {
+                parent::tearDown();
+
+                $this->set_current_user( $this->old_user );
+        }
+
+        /**
+         * @group bp_blogs_get_site
+         */
+        public function test_bp_blogs_get_site_by_slug() {
+                $single_site = bp_blogs_get_site( '/tazfoo/' );
+                $this->assertSame( $single_site->domain, $this->sites['taz']['domain'] );
+
+                if ( $this->test_legacy ) {
+                        add_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+
+                        $legacy_site = bp_blogs_get_site( 'barfoo/' );
+                        $this->assertSame( $legacy_site->domain, $this->sites['bar']['domain'] );
+
+                        remove_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+                }
+        }
+
+        /**
+         * @group bp_blogs_get_site
+         */
+        public function test_bp_blogs_get_site_by_id() {
+                $single_site = bp_blogs_get_site( $this->sites['foo']['id'] );
+                $this->assertSame( $single_site->domain, $this->sites['foo']['domain'] );
+
+                if ( $this->test_legacy ) {
+                        add_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+
+                        $legacy_site = bp_blogs_get_site( $this->sites['private']['id'] );
+                        $this->assertSame( $legacy_site->domain, $this->sites['private']['domain'] );
+
+                        remove_filter( 'bp_blogs_use_bp_site_query', '__return_false' );
+                }
+        }
+}