Ticket #35791: 35791.3.patch

src/wp-includes/class-wp-site-query.php

@@ +1 @@
+<?php
+
+/**
+ * Site API: WP_Site_Query class
+ *
+ * @package WordPress
+ * @subpackage Sites
+ * @since 4.6.0
+ */
+
+/**
+ * Core class used for querying sites.
+ *
+ * @since 4.6.0
+ *
+ * @see WP_Site_Query::__construct() for accepted arguments.
+ */
+class WP_Site_Query {
+
+        /**
+         * SQL for database query.
+         *
+         * @since 4.6.0
+         * @access public
+         * @var string
+         */
+        public $request;
+
+        /**
+         * SQL query clauses.
+         *
+         * @since 4.6.0
+         * @access protected
+         * @var array
+         */
+        protected $sql_clauses = array(
+                'select'  => '',
+                'from'    => '',
+                'where'   => array(),
+                'groupby' => '',
+                'orderby' => '',
+                'limits'  => '',
+        );
+
+        /**
+         * SQL WHERE clause.
+         *
+         * Stored after the 'sites_clauses' filter is run on the compiled WHERE sub-clauses.
+         *
+         * @since 4.6.0
+         * @access protected
+         * @var string
+         */
+        protected $filtered_where_clause;
+
+        /**
+         * Date query container
+         *
+         * @since 4.6.0
+         * @access public
+         * @var object WP_Date_Query
+         */
+        public $date_query = false;
+
+        /**
+         * Query vars set by the user.
+         *
+         * @since 4.6.0
+         * @access public
+         * @var array
+         */
+        public $query_vars;
+
+        /**
+         * Default values for query vars.
+         *
+         * @since 4.6.0
+         * @access public
+         * @var array
+         */
+        public $query_var_defaults;
+
+        /**
+         * List of sites located by the query.
+         *
+         * @since 4.6.0
+         * @access public
+         * @var array
+         */
+        public $sites;
+
+        /**
+         * The amount of found sites for the current query.
+         *
+         * @since 4.6.0
+         * @access public
+         * @var int
+         */
+        public $found_sites = 0;
+
+        /**
+         * The number of pages.
+         *
+         * @since 4.6.0
+         * @access public
+         * @var int
+         */
+        public $max_num_pages = 0;
+
+        /**
+         * Make private/protected methods readable for backwards compatibility.
+         *
+         * @since 4.6.0
+         * @access public
+         *
+         * @param callable $name Method to call.
+         * @param array $arguments Arguments to pass when calling.
+         *
+         * @return mixed|false Return value of the callback, false otherwise.
+         */
+        public function __call( $name, $arguments ) {
+                if ( 'get_search_sql' === $name ) {
+                        return call_user_func_array( array( $this, $name ), $arguments );
+                }
+
+                return false;
+        }
+
+        /**
+         * Constructor.
+         *
+         * Sets up the site query, based on the query vars passed.
+         *
+         * @since 4.6.0
+         * @access public
+         *
+         * @param string|array $query {
+         *     Optional. Array or query string of site query parameters. Default empty.
+         *
+         * @type array $site__in Array of site IDs to include. Default empty.
+         * @type array $site__not_in Array of site IDs to exclude. Default empty.
+         * @type array $date_query Date query clauses to limit sites by. See WP_Date_Query.
+         *                                                   Default null.
+         * @type string $fields Site fields to return. Accepts 'ids' for site IDs
+         *                                                   only, 'count' for a site count or empty for all fields. Default empty.
+         * @type int $ID Currently unused.
+         * @type int $number Maximum number of sites to retrieve.
+         *                                                   Default null (no limit).
+         * @type int $offset Number of sites to offset the query. Used to build
+         *                                                   LIMIT clause. Default 0.
+         * @type bool $no_found_rows Whether to disable the `SQL_CALC_FOUND_ROWS` query.
+         *                                                   Default: true.
+         * @type string|array $orderby Site status or array of statuses. To use 'meta_value'
+         *                                                   or 'meta_value_num', `$meta_key` must also be defined.
+         *                                                   To sort by a specific `$meta_query` clause, use that
+         *                                                   clause's array key. Accepts 'site_agent',
+         *                                                   'site_approved', 'site_author',
+         *                                                   'site_author_email', 'site_author_IP',
+         *                                                   'site_author_url', 'site_content', 'site_date',
+         *                                                   'site_date_gmt', 'blog_id', 'site_karma',
+         *                                                   'site_parent', 'site_id', 'site_type',
+         *                                                   'user_id', 'site__in', 'meta_value', 'meta_value_num',
+         *                                                   the value of $meta_key, and the array keys of
+         *                                                   `$meta_query`. Also accepts false, an empty array, or
+         *                                                   'none' to disable `ORDER BY` clause.
+         *                                                   Default: 'site_date_gmt'.
+         * @type string $order How to order retrieved sites. Accepts 'ASC', 'DESC'.
+         *                                                   Default: 'DESC'.
+         * @type string $domain Limit results to those affiliated with a given network ID.
+         *                                                   Default current network id.
+         * @type array $domain__in Array of domains to include affiliated sites for.
+         *                                                   Default empty.
+         * @type array $domain__not_in Array of domains to exclude affiliated sites for.
+         *                                                   Default empty.
+         * @type string $path Limit results to those affiliated with a given network ID.
+         *                                                   Default current network id.
+         * @type array $path__in Array of paths to include affiliated sites for.
+         *                                                   Default empty.
+         * @type array $path__not_in Array of paths to exclude affiliated sites for.
+         *                                                   Default empty.
+         * @type int $network_id Limit results to those affiliated with a given network ID.
+         *                                                   Default current network id.
+         * @type array $network__in Array of network IDs to include affiliated sites for.
+         *                                                   Default empty.
+         * @type array $network__not_in Array of network IDs to exclude affiliated sites for.
+         *                                                   Default empty.
+         * @type string $search Search term(s) to retrieve matching sites for.
+         *                                                   Default empty.
+         * @type bool $update_site_cache Whether to prime the cache for site networks.
+         *                                                   Default false.
+         * }
+         */
+        public function __construct( $query = '' ) {
+                $this->query_var_defaults = array(
+                        'fields'            => '',
+                        'ID'                => '',
+                        'site__in'          => '',
+                        'site__not_in'      => '',
+                        'number'            => '',
+                        'offset'            => '',
+                        'no_found_rows'     => true,
+                        'orderby'           => '',
+                        'order'             => 'DESC',
+                        'network_id'        => 0,
+                        'network__in'       => '',
+                        'network__not_in'   => '',
+                        'domain'            => '',
+                        'domain__in'        => '',
+                        'domain__not_in'    => '',
+                        'path'              => '',
+                        'path__in'          => '',
+                        'path__not_in'      => '',
+                        'public'            => 'all',
+                        'archived'          => 'all',
+                        'mature'            => 'all',
+                        'spam'              => 'all',
+                        'deleted'           => 'all',
+                        'search'            => '',
+                        'date_query'        => null, // See WP_Date_Query
+                        'update_site_cache' => true,
+                );
+
+                if ( ! empty( $query ) ) {
+                        $this->query( $query );
+                }
+        }
+
+        /**
+         * Parse arguments passed to the site query with default query parameters.
+         *
+         * @since  4.6.0 Extracted from WP_Site_Query::query().
+         *
+         * @access public
+         *
+         * @param string|array $query WP_Site_Query arguments. See WP_Site_Query::__construct()
+         */
+        public function parse_query( $query = '' ) {
+                if ( empty( $query ) ) {
+                        $query = $this->query_vars;
+                }
+
+                $this->query_vars = wp_parse_args( $query, $this->query_var_defaults );
+                do_action_ref_array( 'parse_site_query', array( &$this ) );
+        }
+
+        /**
+         * Sets up the WordPress query for retrieving sites.
+         *
+         * @since 4.6.0
+         * @access public
+         *
+         * @param string|array $query Array or URL query string of parameters.
+         *
+         * @return array|int List of sites, or number of sites when the 'fields' query var is set to 'count'.
+         */
+        public function query( $query ) {
+                $this->query_vars = wp_parse_args( $query );
+
+                return $this->get_sites();
+        }
+
+        /**
+         * Get a list of sites matching the query vars.
+         *
+         * @since 4.6.0
+         * @access public
+         *
+         * @global wpdb $wpdb WordPress database abstraction object.
+         *
+         * @return int|array The list of sites.
+         */
+        public function get_sites() {
+                global $wpdb;
+
+                $this->parse_query();
+
+
+                /**
+                 * Fires before sites are retrieved.
+                 *
+                 * @since 4.6.0
+                 *
+                 * @param WP_Site_Query &$this Current instance of WP_Site_Query, passed by reference.
+                 */
+                do_action_ref_array( 'pre_get_sites', array( &$this ) );
+
+                // $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
+                $key          = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
+                $last_changed = wp_cache_get( 'last_changed', 'site' );
+                if ( ! $last_changed ) {
+                        $last_changed = microtime();
+                        wp_cache_set( 'last_changed', $last_changed, 'site' );
+                }
+                $cache_key = "get_site_ids:$key:$last_changed";
+
+                $site_ids = wp_cache_get( $cache_key, 'site' );
+                if ( false === $site_ids ) {
+                        $site_ids = $this->get_site_ids();
+                        wp_cache_add( $cache_key, $site_ids, 'site' );
+                }
+
+                // If querying for a count only, there's nothing more to do.
+                if ( 'count' === $this->query_vars['fields'] ) {
+                        // $site_ids is actually a count in this case.
+                        return intval( $site_ids );
+                }
+
+                $site_ids = array_map( 'intval', $site_ids );
+
+                $this->site_count = count( $this->sites );
+
+                if ( $site_ids && $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
+                        /**
+                         * Filter the query used to retrieve found site count.
+                         *
+                         * @since 4.6.0
+                         *
+                         * @param string $found_sites_query SQL query. Default 'SELECT FOUND_ROWS()'.
+                         * @param WP_Site_Query $site_query The `WP_Site_Query` instance.
+                         */
+                        $found_sites_query = apply_filters( 'found_sites_query', 'SELECT FOUND_ROWS()', $this );
+                        $this->found_sites = (int) $wpdb->get_var( $found_sites_query );
+
+                        $this->max_num_pages = ceil( $this->found_sites / $this->query_vars['number'] );
+                }
+
+                if ( 'ids' === $this->query_vars['fields'] ) {
+                        $this->sites = $site_ids;
+
+                        return $this->sites;
+                }
+
+                // Fetch full site objects from the primed cache.
+                $_sites = array();
+                foreach ( $site_ids as $site_id ) {
+                        if ( $_site = get_site( $site_id ) ) {
+                                $_sites[] = $_site;
+                        }
+                }
+
+                // Prime site network caches.
+                if ( $this->query_vars['update_site_cache'] ) {
+                        $site_ids = array();
+                        foreach ( $_sites as $_site ) {
+                                $site_ids[] = $_site->site_id;
+                        }
+                        _prime_site_caches( $site_ids );
+                }
+
+                /**
+                 * Filter the site query results.
+                 *
+                 * @since 4.6.0
+                 *
+                 * @param array $results An array of sites.
+                 * @param WP_Site_Query &$this Current instance of WP_Site_Query, passed by reference.
+                 */
+                $_sites = apply_filters_ref_array( 'the_sites', array( $_sites, &$this ) );
+
+                // Convert to WP_Site instances
+                $sites = array_map( 'get_site', $_sites );
+
+                $this->sites = $sites;
+
+                return $this->sites;
+        }
+
+        /**
+         * Used internally to get a list of site IDs matching the query vars.
+         *
+         * @since 4.6.0
+         * @access protected
+         *
+         * @global wpdb $wpdb WordPress database abstraction object.
+         */
+        protected function get_site_ids() {
+                global $wpdb;
+
+                $order = ( 'ASC' == strtoupper( $this->query_vars['order'] ) ) ? 'ASC' : 'DESC';
+
+                // Disable ORDER BY with 'none', an empty array, or boolean false.
+                if ( in_array( $this->query_vars['orderby'], array( 'none', array(), false ), true ) ) {
+                        $orderby = '';
+                } elseif ( ! empty( $this->query_vars['orderby'] ) ) {
+                        $ordersby = is_array( $this->query_vars['orderby'] ) ?
+                                $this->query_vars['orderby'] :
+                                preg_split( '/[,\s]/', $this->query_vars['orderby'] );
+
+                        $orderby_array         = array();
+                        $found_orderby_blog_id = false;
+                        foreach ( $ordersby as $_key => $_value ) {
+                                if ( ! $_value ) {
+                                        continue;
+                                }
+
+                                if ( is_int( $_key ) ) {
+                                        $_orderby = $_value;
+                                        $_order   = $order;
+                                } else {
+                                        $_orderby = $_key;
+                                        $_order   = $_value;
+                                }
+
+                                if ( ! $found_orderby_blog_id && in_array( $_orderby, array( 'blog_id', 'site__in' ) ) ) {
+                                        $found_orderby_blog_id = true;
+                                }
+
+                                $parsed = $this->parse_orderby( $_orderby );
+
+                                if ( ! $parsed ) {
+                                        continue;
+                                }
+
+                                if ( 'site__in' === $_orderby ) {
+                                        $orderby_array[] = $parsed;
+                                        continue;
+                                }
+
+                                $orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+                        }
+
+                        $orderby = implode( ', ', $orderby_array );
+                } else {
+                        $orderby = "blog_id $order";
+                }
+
+                $number = absint( $this->query_vars['number'] );
+                $offset = absint( $this->query_vars['offset'] );
+
+                if ( ! empty( $number ) ) {
+                        if ( $offset ) {
+                                $limits = 'LIMIT ' . $offset . ',' . $number;
+                        } else {
+                                $limits = 'LIMIT ' . $number;
+                        }
+                }
+
+                if ( 'count' === $this->query_vars['fields'] ) {
+                        $fields = 'COUNT(*)';
+                } else {
+                        $fields = "blog_id";
+                }
+
+                // Parse site IDs for an IN clause.
+                $site_id = absint( $this->query_vars['ID'] );
+                if ( ! empty( $site_id ) ) {
+                        $this->sql_clauses['where']['ID'] = $wpdb->prepare( 'blog_id = %d', $site_id );
+                }
+
+                // Parse site IDs for an IN clause.
+                if ( ! empty( $this->query_vars['site__in'] ) ) {
+                        $this->sql_clauses['where']['site__in'] = "blog_id IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['site__in'] ) ) . ' )';
+                }
+
+                // Parse site IDs for a NOT IN clause.
+                if ( ! empty( $this->query_vars['site__not_in'] ) ) {
+                        $this->sql_clauses['where']['site__not_in'] = "blog_id NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['site__not_in'] ) ) . ' )';
+                }
+
+                $network_id = absint( $this->query_vars['network_id'] );
+                if ( ! empty( $network_id ) ) {
+                        $this->sql_clauses['where']['network_id'] = $wpdb->prepare( 'site_id = %d', $network_id );
+                }
+
+                // Parse site network IDs for an IN clause.
+                if ( ! empty( $this->query_vars['network__in'] ) ) {
+                        $this->sql_clauses['where']['network__in'] = 'site_id IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['network__in'] ) ) . ' )';
+                }
+
+                // Parse site network IDs for a NOT IN clause.
+                if ( ! empty( $this->query_vars['network__not_in'] ) ) {
+                        $this->sql_clauses['where']['network__not_in'] = 'site_id NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['network__not_in'] ) ) . ' )';
+                }
+
+
+                if ( ! empty( $this->query_vars['domain'] ) ) {
+                        $this->sql_clauses['where']['domain'] = $wpdb->prepare( 'domain = %s', $this->query_vars['domain'] );
+                }
+
+                // Parse site domain for an IN clause.
+                if ( is_array( $this->query_vars['domain__in'] ) ) {
+                        $this->sql_clauses['where']['domain__in'] = "domain IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__in'] ) ) . "' )";
+                }
+
+                // Parse site domain for a NOT IN clause.
+                if ( is_array( $this->query_vars['domain__not_in'] ) ) {
+                        $this->sql_clauses['where']['domain__not_in'] = "domain NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__not_in'] ) ) . "' )";
+                }
+
+
+                if ( ! empty( $this->query_vars['path'] ) ) {
+                        $this->sql_clauses['where']['path'] = $wpdb->prepare( 'path = %s', $this->query_vars['path'] );
+                }
+
+                // Parse site path for an IN clause.
+                if ( is_array( $this->query_vars['path__in'] ) ) {
+                        $this->sql_clauses['where']['path__in'] = "path IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__in'] ) ) . "' )";
+                }
+
+                // Parse site path for a NOT IN clause.
+                if ( is_array( $this->query_vars['path__not_in'] ) ) {
+                        $this->sql_clauses['where']['path__not_in'] = "path NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__not_in'] ) ) . "' )";
+                }
+
+
+                if ( is_numeric( $this->query_vars['archived'] ) ) {
+                        $archived                               = absint( $this->query_vars['archived'] );
+                        $this->sql_clauses['where']['archived'] = $wpdb->prepare( "archived = %d ", $archived );
+                }
+
+                if ( is_numeric( $this->query_vars['mature'] ) ) {
+                        $mature                               = absint( $this->query_vars['mature'] );
+                        $this->sql_clauses['where']['mature'] = $wpdb->prepare( "mature = %d ", $mature );
+                }
+
+                if ( is_numeric( $this->query_vars['spam'] ) ) {
+                        $spam                               = absint( $this->query_vars['spam'] );
+                        $this->sql_clauses['where']['spam'] = $wpdb->prepare( "spam = %d ", $spam );
+                }
+
+                if ( is_numeric( $this->query_vars['deleted'] ) ) {
+                        $deleted                               = absint( $this->query_vars['deleted'] );
+                        $this->sql_clauses['where']['deleted'] = $wpdb->prepare( "deleted = %d ", $deleted );
+                }
+
+                // Falsy search strings are ignored.
+                if ( strlen( $this->query_vars['search'] ) ) {
+                        $search_sql = $this->get_search_sql(
+                                $this->query_vars['search'],
+                                array( 'domain', 'path' )
+                        );
+
+                        // Strip leading 'AND'.
+                        $this->sql_clauses['where']['search'] = preg_replace( '/^\s*AND\s*/', '', $search_sql );
+                }
+
+                $date_query = $this->query_vars['date_query'];
+                if ( ! empty( $date_query ) && is_array( $date_query ) ) {
+                        $date_query_object                        = new WP_Date_Query( $date_query, 'registered' );
+                        $this->sql_clauses['where']['date_query'] = preg_replace( '/^\s*AND\s*/', '', $date_query_object->get_sql() );
+                }
+
+                $where = implode( ' AND ', $this->sql_clauses['where'] );
+
+                $pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+                /**
+                 * Filter the site query clauses.
+                 *
+                 * @since 4.6.0
+                 *
+                 * @param array $pieces A compacted array of site query clauses.
+                 * @param WP_Site_Query &$this Current instance of WP_Site_Query, passed by reference.
+                 */
+                $clauses = apply_filters_ref_array( 'sites_clauses', array( compact( $pieces ), &$this ) );
+                $fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
+                $join    = isset( $clauses['join'] ) ? $clauses['join'] : '';
+                $where   = isset( $clauses['where'] ) ? $clauses['where'] : '';
+                $orderby = isset( $clauses['orderby'] ) ? $clauses['orderby'] : '';
+                $limits  = isset( $clauses['limits'] ) ? $clauses['limits'] : '';
+                $groupby = isset( $clauses['groupby'] ) ? $clauses['groupby'] : '';
+
+                $this->filtered_where_clause = $where;
+
+                if ( $where ) {
+                        $where = 'WHERE ' . $where;
+                }
+
+                if ( $groupby ) {
+                        $groupby = 'GROUP BY ' . $groupby;
+                }
+
+                if ( $orderby ) {
+                        $orderby = "ORDER BY $orderby";
+                }
+
+                $found_rows = '';
+                if ( ! $this->query_vars['no_found_rows'] ) {
+                        $found_rows = 'SQL_CALC_FOUND_ROWS';
+                }
+
+                $this->sql_clauses['select']  = "SELECT $found_rows $fields";
+                $this->sql_clauses['from']    = "FROM $wpdb->blogs $join";
+                $this->sql_clauses['groupby'] = $groupby;
+                $this->sql_clauses['orderby'] = $orderby;
+                $this->sql_clauses['limits']  = $limits;
+
+                $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
+
+                if ( 'count' === $this->query_vars['fields'] ) {
+                        return intval( $wpdb->get_var( $this->request ) );
+                } else {
+                        $site_ids = $wpdb->get_col( $this->request );
+
+                        return array_map( 'intval', $site_ids );
+                }
+        }
+
+        /**
+         * Used internally to generate an SQL string for searching across multiple columns
+         *
+         * @since 4.6.0
+         * @access protected
+         *
+         * @global wpdb $wpdb WordPress database abstraction object.
+         *
+         * @param string $string
+         * @param array $cols
+         *
+         * @return string
+         */
+        protected function get_search_sql( $string, $cols ) {
+                global $wpdb;
+
+                $like = '%' . $wpdb->esc_like( $string ) . '%';
+
+                $searches = array();
+                foreach ( $cols as $col ) {
+                        $searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+                }
+
+                return ' AND (' . implode( ' OR ', $searches ) . ')';
+        }
+
+        /**
+         * Parse and sanitize 'orderby' keys passed to the site query.
+         *
+         * @since 4.6.0
+         * @access protected
+         *
+         * @global wpdb $wpdb WordPress database abstraction object.
+         *
+         * @param string $orderby Alias for the field to order by.
+         *
+         * @return string|false Value to used in the ORDER clause. False otherwise.
+         */
+        protected function parse_orderby( $orderby ) {
+                global $wpdb;
+
+                switch ( $orderby ) {
+                        case 'domain':
+                        case 'last_updated':
+                        case 'path':
+                        case 'registered':
+                                $_orderby = $orderby;
+                                break;
+                        case 'network_id':
+                                $_orderby = "site_id";
+                                break;
+                        case 'ids':
+                        default:
+                                $_orderby = "blog_id";
+                                break;
+                }
+
+                $parsed = "$_orderby";
+
+
+                return $parsed;
+        }
+
+        /**
+         * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
+         *
+         * @since 4.6.0
+         * @access protected
+         *
+         * @param string $order The 'order' query variable.
+         *
+         * @return string The sanitized 'order' query variable.
+         */
+        protected function parse_order( $order ) {
+                if ( ! is_string( $order ) || empty( $order ) ) {
+                        return 'DESC';
+                }
+
+                if ( 'ASC' === strtoupper( $order ) ) {
+                        return 'ASC';
+                } else {
+                        return 'DESC';
+                }
+        }
+}

src/wp-includes/date.php

@@ -489 +489 @@
                 global $wpdb;
 
                 $valid_columns = array(
-                        'post_date', 'post_date_gmt', 'post_modified',
-                        'post_modified_gmt', 'comment_date', 'comment_date_gmt',
+                        'post_date',
+                        'post_date_gmt',
+                        'post_modified',
+                        'post_modified_gmt',
+                        'comment_date',
+                        'comment_date_gmt',
                         'user_registered',
+                        'registered',
+                        'last_updated',
                 );
 
                 // Attempt to detect a table prefix.
@@ -525 +531 @@
                                 $wpdb->users => array(
                                         'user_registered',
                                 ),
+                                $wpdb->blogs => array(
+                                        'registered',
+                                        'last_updated',
+                                ),
                         );
 
                         // If it's a known column name, add the appropriate table prefix.

src/wp-includes/http.php

@@ -607 +607 @@
  * @return bool
  */
 function ms_allowed_http_request_hosts( $is_external, $host ) {
-        global $wpdb;
         static $queried = array();
-        if ( $is_external )
+        if ( $is_external ) {
                 return $is_external;
-        if ( $host === get_current_site()->domain )
+        }
+        if ( $host === get_current_site()->domain ) {
                 return true;
-        if ( isset( $queried[ $host ] ) )
+        }
+        if ( isset( $queried[ $host ] ) ) {
                 return $queried[ $host ];
-        $queried[ $host ] = (bool) $wpdb->get_var( $wpdb->prepare( "SELECT domain FROM $wpdb->blogs WHERE domain = %s LIMIT 1", $host ) );
+        }
+        $query            = new WP_Site_Query();
+        $result           = $query->query( array( 'domain' => $host, 'count' => true ) );
+        $queried[ $host ] = (bool) $result;
+
         return $queried[ $host ];
 }
 

src/wp-includes/ms-blogs.php

@@ -99 +99 @@
                 $path = $current_site->path . $slug . '/';
         }
 
-        $blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
+        $query   = new WP_Site_Query();
+        $result  = $query->query( array( 'domain' => $domain, 'path' => $path, 'fields' => 'ids' ) );
+        $blog_id = array_shift( $result );
+
         wp_cache_set( 'get_id_from_blogname_' . $slug, $blog_id, 'blog-details' );
+
         return $blog_id;
 }
 
@@ -126 +130 @@
                 } elseif ( isset($fields['domain']) && isset($fields['path']) ) {
                         $key = md5( $fields['domain'] . $fields['path'] );
                         $blog = wp_cache_get($key, 'blog-lookup');
-                        if ( false !== $blog )
+                        if ( false !== $blog ) {
                                 return $blog;
+                        }
+
+                        $domains = array( $fields['domain'] );
                         if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
-                                $nowww = substr( $fields['domain'], 4 );
-                                $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
-                        } else {
-                                $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path'] ) );
+                                $domains[] = substr( $fields['domain'], 4 );
                         }
+
+                        $query  = new WP_Site_Query();
+                        $args = array( 'domain__in' => $domains, 'path' => $fields['path'], 'number' => 1 );
+                        $result = $query->query( $args );
+                        $blog   = array_shift( $result );
+
                         if ( $blog ) {
                                 wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
                                 $blog_id = $blog->blog_id;
@@ -143 +153 @@
                 } elseif ( isset($fields['domain']) && is_subdomain_install() ) {
                         $key = md5( $fields['domain'] );
                         $blog = wp_cache_get($key, 'blog-lookup');
-                        if ( false !== $blog )
+                        if ( false !== $blog ) {
                                 return $blog;
+                        }
+                        $domains = array($fields['domain']);
                         if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
-                                $nowww = substr( $fields['domain'], 4 );
-                                $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
-                        } else {
-                                $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain'] ) );
+                                $domains[] = substr( $fields['domain'], 4 );
                         }
+
+                        $query = new WP_Site_Query();
+                        $args = array( 'domain__in' => $domains, 'number' => 1 );
+                        $result = $query->query( $args );
+                        $blog   = array_shift( $result );
+
                         if ( $blog ) {
                                 wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
                                 $blog_id = $blog->blog_id;
@@ -457 +472 @@
 }
 
 /**
+ * Retrieves site data given a site ID or site object.
+ *
+ * If an object is passed then the site data will be cached and then returned
+ * after being passed through a filter. If the site is empty, then the global
+ * site variable will be used, if it is set.
+ *
+ * @since 4.6.0
+ *
+ * @global WP_Site $site
+ *
+ * @param WP_Site|string|int $site Site to retrieve.
+ * @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants.
+ *
+ * @return WP_Site|array|null Depends on $output value.
+ */
+function get_site( &$site = null, $output = OBJECT ) {
+        global $current_blog;
+        if ( empty( $site ) && isset( $current_blog ) ) {
+                $site = $current_blog;
+        }
+
+        if ( $site instanceof WP_Site ) {
+                $_site = $site;
+        } elseif ( is_object( $site ) ) {
+                $_site = new WP_Site( $site );
+        } else {
+                $_site = WP_Site::get_instance( $site );
+        }
+
+        if ( ! $_site ) {
+                return null;
+        }
+
+        /**
+         * Fires after a site is retrieved.
+         *
+         * @since 4.6.0
+         *
+         * @param mixed $_site Site data.
+         */
+        $_site = apply_filters( 'get_site', $_site );
+
+        if ( $output == OBJECT ) {
+                return $_site;
+        } elseif ( $output == ARRAY_A ) {
+                return $_site->to_array();
+        } elseif ( $output == ARRAY_N ) {
+                return array_values( $_site->to_array() );
+        }
+
+        return $_site;
+}
+
+/**
+ * Adds any sites from the given ids to the cache that do not already exist in cache
+ *
+ * @since 4.6.0
+ * @access private
+ *
+ * @see update_site_cache()
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param array $ids ID list.
+ */
+function _prime_site_caches( $ids ) {
+        global $wpdb;
+
+        $non_cached_ids = _get_non_cached_ids( $ids, 'sites' );
+        if ( ! empty( $non_cached_ids ) ) {
+                $fresh_sites = $wpdb->get_results( sprintf( "SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", join( ",", $non_cached_ids ) ) );
+
+                update_site_cache( $fresh_sites );
+        }
+}
+
+/**
+ * Updates sites in cache.
+ *
+ * @since 4.6.0
+ *
+ * @param array $sites Array of site objects, passed by reference.
+ */
+function update_site_cache( &$sites ) {
+        if ( ! $sites ) {
+                return;
+        }
+
+        foreach ( $sites as $site ) {
+                wp_cache_add( $site->blog_id, $site, 'sites' );
+        }
+}
+
+/**
  * Retrieve option value for a given blog id based on name of option.
  *
  * If the option does not exist or does not have a value, then the return value

src/wp-includes/ms-functions.php

@@ -308 +308 @@
         global $wpdb;
 
         $domain = strtolower( $domain );
-        $path = strtolower( $path );
-        $id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
+        $path   = strtolower( $path );
+        $id     = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
 
-        if ( $id == -1 ) // blog does not exist
+        if ( $id == - 1 ) // blog does not exist
+        {
                 return 0;
-        elseif ( $id )
+        } elseif ( $id ) {
                 return (int) $id;
+        }
 
-        $id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
+        $query  = new WP_Site_Query();
+        $result = $query->query( array( 'domain' => $domain, 'path' => $path, 'fields' => 'ids' ) );
+        $id     = array_shift( $result );
+        if ( ! $id ) {
+                wp_cache_set( md5( $domain . $path ), - 1, 'blog-id-cache' );
 
-        if ( ! $id ) {
-                wp_cache_set( md5( $domain . $path ), -1, 'blog-id-cache' );
                 return 0;
         }
 
@@ -1255 +1259 @@
  * @return int
  */
 function domain_exists($domain, $path, $site_id = 1) {
-        global $wpdb;
         $path = trailingslashit( $path );
-        $result = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
 
+        $query = new WP_Site_Query();
+        $args = array( 'path' => $path, 'domain' => $domain, 'network' => $site_id, 'number' => 1, 'fields' => 'ids' );
+        $result = $query->query( $args );
+        $site   = array_shift( $result );
+
         /**
          * Filter whether a blogname is taken.
          *
          * @since 3.5.0
          *
-         * @param int|null $result  The blog_id if the blogname exists, null otherwise.
+         * @param int|null $site  The blog_id if the blogname exists, null otherwise.
          * @param string   $domain  Domain to be checked.
          * @param string   $path    Path to be checked.
          * @param int      $site_id Site ID. Relevant only on multi-network installs.
          */
-        return apply_filters( 'domain_exists', $result, $domain, $path, $site_id );
+        return apply_filters( 'domain_exists', $site, $domain, $path, $site_id );
 }
 
 /**
@@ -2252 +2259 @@
 function wp_update_network_site_counts() {
         global $wpdb;
 
-        $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid) );
+
+        $query = new WP_Site_Query();
+        $args = array( 'network_id' => $wpdb->siteid, 'spam' => 0, 'deleted' => 0, 'archived' => 0, 'count' => true );
+        $count = $query->query( $args );
+
         update_site_option( 'blog_count', $count );
 }
 
@@ -2432 +2443 @@
 function wp_get_sites( $args = array() ) {
         global $wpdb;
 
-        if ( wp_is_large_network() )
-                return array();
-
         $defaults = array(
                 'network_id' => $wpdb->siteid,
-                'public'     => null,
-                'archived'   => null,
-                'mature'     => null,
-                'spam'       => null,
-                'deleted'    => null,
+                'fields'     => '',
                 'limit'      => 100,
                 'offset'     => 0,
         );
 
         $args = wp_parse_args( $args, $defaults );
 
-        $query = "SELECT * FROM $wpdb->blogs WHERE 1=1 ";
+        $query = new WP_Site_Query();
 
-        if ( isset( $args['network_id'] ) && ( is_array( $args['network_id'] ) || is_numeric( $args['network_id'] ) ) ) {
-                $network_ids = implode( ',', wp_parse_id_list( $args['network_id'] ) );
-                $query .= "AND site_id IN ($network_ids) ";
+        $sites = $query->query( $args );
+        if ( empty( $args['fields'] ) ) {
+                $sites = array_map( 'get_site', $sites, array_fill( 0, count( $sites ), ARRAY_A ) );
         }
-
-        if ( isset( $args['public'] ) )
-                $query .= $wpdb->prepare( "AND public = %d ", $args['public'] );
-
-        if ( isset( $args['archived'] ) )
-                $query .= $wpdb->prepare( "AND archived = %d ", $args['archived'] );
-
-        if ( isset( $args['mature'] ) )
-                $query .= $wpdb->prepare( "AND mature = %d ", $args['mature'] );
-
-        if ( isset( $args['spam'] ) )
-                $query .= $wpdb->prepare( "AND spam = %d ", $args['spam'] );
-
-        if ( isset( $args['deleted'] ) )
-                $query .= $wpdb->prepare( "AND deleted = %d ", $args['deleted'] );
-
-        if ( isset( $args['limit'] ) && $args['limit'] ) {
-                if ( isset( $args['offset'] ) && $args['offset'] )
-                        $query .= $wpdb->prepare( "LIMIT %d , %d ", $args['offset'], $args['limit'] );
-                else
-                        $query .= $wpdb->prepare( "LIMIT %d ", $args['limit'] );
-        }
-
-        $site_results = $wpdb->get_results( $query, ARRAY_A );
-
-        return $site_results;
+        return $sites;
 }
 
 /**

src/wp-includes/ms-load.php

@@ -231 +231 @@
         $domains = array( $domain );
         if ( 'www.' === substr( $domain, 0, 4 ) ) {
                 $domains[] = substr( $domain, 4 );
-                $search_domains = "'" . implode( "', '", $wpdb->_escape( $domains ) ) . "'";
         }
 
-        if ( count( $paths ) > 1 ) {
-                $search_paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'";
-        }
-
-        if ( count( $domains ) > 1 && count( $paths ) > 1 ) {
-                $site = $wpdb->get_row( "SELECT * FROM $wpdb->blogs WHERE domain IN ($search_domains) AND path IN ($search_paths) ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC LIMIT 1" );
-        } elseif ( count( $domains ) > 1 ) {
-                $sql = $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE path = %s", $paths[0] );
-                $sql .= " AND domain IN ($search_domains) ORDER BY CHAR_LENGTH(domain) DESC LIMIT 1";
-                $site = $wpdb->get_row( $sql );
-        } elseif ( count( $paths ) > 1 ) {
-                $sql = $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $domains[0] );
-                $sql .= " AND path IN ($search_paths) ORDER BY CHAR_LENGTH(path) DESC LIMIT 1";
-                $site = $wpdb->get_row( $sql );
-        } else {
-                $site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domains[0], $paths[0] ) );
-        }
-
+        $query = new WP_Site_Query();
+        $args = array( 'path__in' => $path, 'domain__in' => $domains, 'number' => 1 );
+        $result = $query->query( $args );
+        $site   = array_shift( $result );
         if ( $site ) {
                 // @todo get_blog_details()
                 return $site;

src/wp-settings.php

@@ -99 +99 @@
 
 // Initialize multisite if enabled.
 if ( is_multisite() ) {
+        require( ABSPATH . WPINC . '/class-wp-site-query.php' );
         require( ABSPATH . WPINC . '/ms-blogs.php' );
         require( ABSPATH . WPINC . '/ms-settings.php' );
 } elseif ( ! defined( 'MULTISITE' ) ) {