Ticket #40447: 40447.patch

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

@@ -92 +92 @@
          * Sets up the network query, based on the query vars passed.
          *
          * @since 4.6.0
+         * @since 4.8.0 Introduced the 'cache_domain' parameter.
          * @access public
          *
          * @param string|array $query {
@@ -119 +120 @@
          *     @type array        $path__not_in         Array of paths to exclude affiliated networks for. Default empty.
          *     @type string       $search               Search term(s) to retrieve matching networks for. Default empty.
          *     @type bool         $update_network_cache Whether to prime the cache for found networks. Default true.
+         *     @type string       $cache_domain         Unique cache key to be produced when this query is stored in
+         *                                              an object cache. Default is 'core'.
          * }
          */
         public function __construct( $query = '' ) {
@@ -140 +143 @@
                         'path__not_in'         => '',
                         'search'               => '',
                         'update_network_cache' => true,
+                        'cache_domain'         => 'core',
                 );
 
                 if ( ! empty( $query ) ) {

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

@@ -99 +99 @@
          * Sets up the site query, based on the query vars passed.
          *
          * @since 4.6.0
-         * @since 4.8.0 Introduced the 'lang_id', 'lang__in', and 'lang__not_in' parameters.
+         * @since 4.8.0 Introduced the 'lang_id', 'lang__in', 'lang__not_in', and 'cache_domain' parameters.
          * @access public
          *
          * @param string|array $query {
@@ -146 +146 @@
          *     @type array        $search_columns    Array of column names to be searched. Accepts 'domain' and 'path'.
          *                                           Default empty array.
          *     @type bool         $update_site_cache Whether to prime the cache for found sites. Default false.
+         *     @type string       $cache_domain      Unique cache key to be produced when this query is stored in
+         *                                           an object cache. Default is 'core'.
          * }
          */
         public function __construct( $query = '' ) {
@@ -181 +183 @@
                         'count'             => false,
                         'date_query'        => null, // See WP_Date_Query
                         'update_site_cache' => true,
+                        'cache_domain'      => 'core',
                 );
 
                 if ( ! empty( $query ) ) {

src/wp-includes/ms-blogs.php

@@ -581 +581 @@
  * Retrieves a list of sites matching requested arguments.
  *
  * @since 4.6.0
- * @since 4.8.0 Introduced the 'lang_id', 'lang__in', and 'lang__not_in' parameters.
+ * @since 4.8.0 Introduced the 'lang_id', 'lang__in', 'lang__not_in', and 'cache_domain' parameters.
  *
  * @see WP_Site_Query::parse_query()
  *
@@ -629 +629 @@
  *     @type array        $search_columns    Array of column names to be searched. Accepts 'domain' and 'path'.
  *                                           Default empty array.
  *     @type bool         $update_site_cache Whether to prime the cache for found sites. Default false.
+ *     @type string       $cache_domain      Unique cache key to be produced when this query is stored in
+ *                                           an object cache. Default is 'core'.
  * }
  * @return array List of sites.
  */