Index: src/wp-includes/class-wp-network-query.php =================================================================== --- src/wp-includes/class-wp-network-query.php (revision 42412) +++ src/wp-includes/class-wp-network-query.php (working copy) @@ -89,49 +89,52 @@ * @param string|array $query { * Optional. Array or query string of network query parameters. Default empty. * - * @type array $network__in Array of network IDs to include. Default empty. - * @type array $network__not_in Array of network IDs to exclude. Default empty. - * @type bool $count Whether to return a network count (true) or array of network objects. - * Default false. - * @type string $fields Network fields to return. Accepts 'ids' (returns an array of network IDs) - * or empty (returns an array of complete network objects). Default empty. - * @type int $number Maximum number of networks to retrieve. Default empty (no limit). - * @type int $offset Number of networks 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 Network status or array of statuses. Accepts 'id', 'domain', 'path', - * 'domain_length', 'path_length' and 'network__in'. Also accepts false, - * an empty array, or 'none' to disable `ORDER BY` clause. Default 'id'. - * @type string $order How to order retrieved networks. Accepts 'ASC', 'DESC'. Default 'ASC'. - * @type string $domain Limit results to those affiliated with a given domain. Default empty. - * @type array $domain__in Array of domains to include affiliated networks for. Default empty. - * @type array $domain__not_in Array of domains to exclude affiliated networks for. Default empty. - * @type string $path Limit results to those affiliated with a given path. Default empty. - * @type array $path__in Array of paths to include affiliated networks for. Default empty. - * @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 array $network__in Array of network IDs to include. Default empty. + * @type array $network__not_in Array of network IDs to exclude. Default empty. + * @type bool $count Whether to return a network count (true) or array of network objects. + * Default false. + * @type string $fields Network fields to return. Accepts 'ids' (returns an array of network IDs) + * or empty (returns an array of complete network objects). Default empty. + * @type int $number Maximum number of networks to retrieve. Default empty (no limit). + * @type int $offset Number of networks 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 Network status or array of statuses. Accepts 'id', 'domain', 'path', + * 'domain_length', 'path_length' and 'network__in'. Also accepts false, + * an empty array, or 'none' to disable `ORDER BY` clause. Default 'id'. + * @type string $order How to order retrieved networks. Accepts 'ASC', 'DESC'. Default 'ASC'. + * @type string $domain Limit results to those affiliated with a given domain. Default empty. + * @type array $domain__in Array of domains to include affiliated networks for. Default empty. + * @type array $domain__not_in Array of domains to exclude affiliated networks for. Default empty. + * @type string $path Limit results to those affiliated with a given path. Default empty. + * @type array $path__in Array of paths to include affiliated networks for. Default empty. + * @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 bool $update_network_meta_cache Whether to prime the metadata (option) cache for found networks. + * Default true. + * */ public function __construct( $query = '' ) { $this->query_var_defaults = array( - 'network__in' => '', - 'network__not_in' => '', - 'count' => false, - 'fields' => '', - 'number' => '', - 'offset' => '', - 'no_found_rows' => true, - 'orderby' => 'id', - 'order' => 'ASC', - 'domain' => '', - 'domain__in' => '', - 'domain__not_in' => '', - 'path' => '', - 'path__in' => '', - 'path__not_in' => '', - 'search' => '', - 'update_network_cache' => true, + 'network__in' => '', + 'network__not_in' => '', + 'count' => false, + 'fields' => '', + 'number' => '', + 'offset' => '', + 'no_found_rows' => true, + 'orderby' => 'id', + 'order' => 'ASC', + 'domain' => '', + 'domain__in' => '', + 'domain__not_in' => '', + 'path' => '', + 'path__in' => '', + 'path__not_in' => '', + 'search' => '', + 'update_network_cache' => true, + 'update_network_meta_cache' => true, ); if ( ! empty( $query ) ) { @@ -202,6 +205,8 @@ // Ignore the $fields argument as the queried result will be the same regardless. unset( $_args['fields'] ); + unset( $_args['update_network_cache'] ); + unset( $_args['update_network_meta_cache'] ); $key = md5( serialize( $_args ) ); $last_changed = wp_cache_get_last_changed( 'networks' ); @@ -243,7 +248,7 @@ } if ( $this->query_vars['update_network_cache'] ) { - _prime_network_caches( $network_ids ); + _prime_network_caches( $network_ids, $this->query_vars['update_network_meta_cache'] ); } // Fetch full network objects from the primed cache. Index: src/wp-includes/load.php =================================================================== --- src/wp-includes/load.php (revision 42412) +++ src/wp-includes/load.php (working copy) @@ -567,7 +567,7 @@ } if ( function_exists( 'wp_cache_add_global_groups' ) ) { - wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'site-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) ); + wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'site-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site_meta' ) ); wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) ); } } @@ -592,7 +592,6 @@ require( ABSPATH . WPINC . '/kses.php' ); require( ABSPATH . WPINC . '/pluggable.php' ); - require( ABSPATH . WPINC . '/formatting.php' ); $link = wp_guess_url() . '/wp-admin/install.php'; Index: src/wp-includes/ms-blogs.php =================================================================== --- src/wp-includes/ms-blogs.php (revision 42412) +++ src/wp-includes/ms-blogs.php (working copy) @@ -869,7 +869,7 @@ if ( is_array( $global_groups ) ) { wp_cache_add_global_groups( $global_groups ); } else { - wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details' ) ); + wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details', 'site_meta' ) ); } wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) ); } @@ -937,7 +937,7 @@ if ( is_array( $global_groups ) ) { wp_cache_add_global_groups( $global_groups ); } else { - wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details' ) ); + wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details', 'site_meta' ) ); } wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) ); } @@ -1217,6 +1217,7 @@ foreach ( (array) $ids as $id ) { wp_cache_delete( $id, 'networks' ); + wp_cache_delete( $id, 'site_meta' ); /** * Fires immediately after a network has been removed from the object cache. @@ -1239,34 +1240,44 @@ * cache using the network group with the key using the ID of the networks. * * @since 4.6.0 + * @since 4.9.0 Introduced the `$update_meta_cache` parameter. * * @param array $networks Array of network row objects. + * @param bool $update_meta_cache Whether to update sitemeta cache. Default true. */ -function update_network_cache( $networks ) { +function update_network_cache( $networks, $update_meta_cache = true ) { + $network_ids = array(); foreach ( (array) $networks as $network ) { + $network_ids[] = $network->id; wp_cache_add( $network->id, $network, 'networks' ); } + + if ( $update_meta_cache ) { + update_meta_cache( 'site', $network_ids ); + } } /** * Adds any networks from the given IDs to the cache that do not already exist in cache. * * @since 4.6.0 + * @since 4.9.0 Introduced the `$update_meta_cache` parameter. * @access private * * @see update_network_cache() * @global wpdb $wpdb WordPress database abstraction object. * * @param array $network_ids Array of network IDs. + * @param bool $update_meta_cache Optional. Whether to update the meta cache. Default true. */ -function _prime_network_caches( $network_ids ) { +function _prime_network_caches( $network_ids, $update_meta_cache = true ) { global $wpdb; $non_cached_ids = _get_non_cached_ids( $network_ids, 'networks' ); if ( ! empty( $non_cached_ids ) ) { $fresh_networks = $wpdb->get_results( sprintf( "SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", join( ',', array_map( 'intval', $non_cached_ids ) ) ) ); - update_network_cache( $fresh_networks ); + update_network_cache( $fresh_networks, $update_meta_cache ); } } Index: src/wp-includes/option.php =================================================================== --- src/wp-includes/option.php (revision 42412) +++ src/wp-includes/option.php (working copy) @@ -237,12 +237,9 @@ * * @since 3.0.0 * - * @global wpdb $wpdb WordPress database abstraction object. - * * @param int $network_id Optional site ID for which to query the options. Defaults to the current site. */ function wp_load_core_site_options( $network_id = null ) { - global $wpdb; if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() ) { return; @@ -252,18 +249,7 @@ $network_id = get_current_network_id(); } - $core_options = array( 'site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' ); - - $core_options_in = "'" . implode( "', '", $core_options ) . "'"; - $options = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $network_id ) ); - - foreach ( $options as $option ) { - $key = $option->meta_key; - $cache_key = "{$network_id}:$key"; - $option->meta_value = maybe_unserialize( $option->meta_value ); - - wp_cache_set( $cache_key, $option->meta_value, 'site-options' ); - } + update_meta_cache( 'site', $network_id ); } /** @@ -1243,55 +1229,18 @@ return $pre; } - // prevent non-existent options from triggering multiple queries - $notoptions_key = "$network_id:notoptions"; - $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); - - if ( isset( $notoptions[ $option ] ) ) { - - /** - * Filters a specific default network option. - * - * The dynamic portion of the hook name, `$option`, refers to the option name. - * - * @since 3.4.0 - * @since 4.4.0 The `$option` parameter was added. - * @since 4.7.0 The `$network_id` parameter was added. - * - * @param mixed $default The value to return if the site option does not exist - * in the database. - * @param string $option Option name. - * @param int $network_id ID of the network. - */ - return apply_filters( "default_site_option_{$option}", $default, $option, $network_id ); - } if ( ! is_multisite() ) { /** This filter is documented in wp-includes/option.php */ $default = apply_filters( 'default_site_option_' . $option, $default, $option, $network_id ); $value = get_option( $option, $default ); } else { - $cache_key = "$network_id:$option"; - $value = wp_cache_get( $cache_key, 'site-options' ); - - if ( ! isset( $value ) || false === $value ) { - $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $network_id ) ); - - // Has to be get_row instead of get_var because of funkiness with 0, false, null values - if ( is_object( $row ) ) { - $value = $row->meta_value; - $value = maybe_unserialize( $value ); - wp_cache_set( $cache_key, $value, 'site-options' ); - } else { - if ( ! is_array( $notoptions ) ) { - $notoptions = array(); - } - $notoptions[ $option ] = true; - wp_cache_set( $notoptions_key, $notoptions, 'site-options' ); - - /** This filter is documented in wp-includes/option.php */ - $value = apply_filters( 'default_site_option_' . $option, $default, $option, $network_id ); - } + $meta = get_metadata( 'site', $network_id, $option ); + if ( is_array( $meta ) && ! empty( $meta ) ) { + $value = array_shift( $meta ); + $value = maybe_unserialize( $value ); + } else { + $value = apply_filters( 'default_site_option_' . $option, $default, $option ); } } @@ -1360,44 +1309,12 @@ */ $value = apply_filters( "pre_add_site_option_{$option}", $value, $option, $network_id ); - $notoptions_key = "$network_id:notoptions"; - if ( ! is_multisite() ) { $result = add_option( $option, $value, '', 'no' ); } else { - $cache_key = "$network_id:$option"; - - // Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query - $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); - if ( ! is_array( $notoptions ) || ! isset( $notoptions[ $option ] ) ) { - if ( false !== get_network_option( $network_id, $option, false ) ) { - return false; - } - } - - $value = sanitize_option( $option, $value ); - - $serialized_value = maybe_serialize( $value ); - $result = $wpdb->insert( - $wpdb->sitemeta, array( - 'site_id' => $network_id, - 'meta_key' => $option, - 'meta_value' => $serialized_value, - ) - ); - - if ( ! $result ) { - return false; - } - - wp_cache_set( $cache_key, $value, 'site-options' ); - - // This option exists now - $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); // yes, again... we need it to be fresh - if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) { - unset( $notoptions[ $option ] ); - wp_cache_set( $notoptions_key, $notoptions, 'site-options' ); - } + $value = sanitize_option( $option, $value ); + $value = maybe_serialize( $value ); + $result = add_metadata( 'site', $network_id, $option, $value, true ); } if ( $result ) { @@ -1479,19 +1396,7 @@ if ( ! is_multisite() ) { $result = delete_option( $option ); } else { - $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $network_id ) ); - if ( is_null( $row ) || ! $row->meta_id ) { - return false; - } - $cache_key = "$network_id:$option"; - wp_cache_delete( $cache_key, 'site-options' ); - - $result = $wpdb->delete( - $wpdb->sitemeta, array( - 'meta_key' => $option, - 'site_id' => $network_id, - ) - ); + $result = delete_metadata( 'site', $network_id, $option, '' ); } if ( $result ) { @@ -1584,30 +1489,12 @@ return add_network_option( $network_id, $option, $value ); } - $notoptions_key = "$network_id:notoptions"; - $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); - if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) { - unset( $notoptions[ $option ] ); - wp_cache_set( $notoptions_key, $notoptions, 'site-options' ); - } - if ( ! is_multisite() ) { $result = update_option( $option, $value, 'no' ); } else { - $value = sanitize_option( $option, $value ); - - $serialized_value = maybe_serialize( $value ); - $result = $wpdb->update( - $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( - 'site_id' => $network_id, - 'meta_key' => $option, - ) - ); - - if ( $result ) { - $cache_key = "$network_id:$option"; - wp_cache_set( $cache_key, $value, 'site-options' ); - } + $value = sanitize_option( $option, $value ); + $value = maybe_serialize( $value ); + $result = update_metadata( 'site', $network_id, $option, $value ); } if ( $result ) { Index: src/wp-settings.php =================================================================== --- src/wp-settings.php (revision 42412) +++ src/wp-settings.php (working copy) @@ -95,6 +95,8 @@ // Load early WordPress files. require( ABSPATH . WPINC . '/compat.php' ); require( ABSPATH . WPINC . '/class-wp-list-util.php' ); +require( ABSPATH . WPINC . '/formatting.php' ); +require( ABSPATH . WPINC . '/meta.php' ); require( ABSPATH . WPINC . '/functions.php' ); require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' ); require( ABSPATH . WPINC . '/class-wp.php' ); @@ -143,7 +145,7 @@ // Load most of WordPress. require( ABSPATH . WPINC . '/class-wp-walker.php' ); require( ABSPATH . WPINC . '/class-wp-ajax-response.php' ); -require( ABSPATH . WPINC . '/formatting.php' ); + require( ABSPATH . WPINC . '/capabilities.php' ); require( ABSPATH . WPINC . '/class-wp-roles.php' ); require( ABSPATH . WPINC . '/class-wp-role.php' ); @@ -158,7 +160,6 @@ require( ABSPATH . WPINC . '/class-wp-user-query.php' ); require( ABSPATH . WPINC . '/class-wp-session-tokens.php' ); require( ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php' ); -require( ABSPATH . WPINC . '/meta.php' ); require( ABSPATH . WPINC . '/class-wp-meta-query.php' ); require( ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php' ); require( ABSPATH . WPINC . '/general-template.php' ); Index: tests/phpunit/includes/testcase.php =================================================================== --- tests/phpunit/includes/testcase.php (revision 42412) +++ tests/phpunit/includes/testcase.php (working copy) @@ -328,7 +328,7 @@ $wp_object_cache->__remoteset(); } wp_cache_flush(); - wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details' ) ); + wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details', 'site_meta' ) ); wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) ); } Index: tests/phpunit/tests/cache.php =================================================================== --- tests/phpunit/tests/cache.php (revision 42412) +++ tests/phpunit/tests/cache.php (working copy) @@ -22,7 +22,7 @@ global $wp_object_cache; $cache_class = get_class( $wp_object_cache ); $cache = new $cache_class(); - $cache->add_global_groups( array( 'global-cache-test', 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details' ) ); + $cache->add_global_groups( array( 'global-cache-test', 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details', 'site_meta' ) ); return $cache; } Index: tests/phpunit/tests/option/multisite.php =================================================================== --- tests/phpunit/tests/option/multisite.php (revision 42412) +++ tests/phpunit/tests/option/multisite.php (working copy) @@ -146,26 +146,6 @@ //$this->assertFalse( get_option( $key2 ) ); // check get_option() } - /** - * @group multisite - */ - function test_site_notoptions() { - $network_id = get_current_network_id(); - $notoptions_key = "{$network_id}:notoptions"; - - $_notoptions = wp_cache_get( 'notoptions', 'site-options' ); - $this->assertEmpty( $_notoptions ); - $_notoptions1 = wp_cache_get( $notoptions_key, 'site-options' ); - $this->assertEmpty( $_notoptions1 ); - - get_site_option( 'burrito' ); - - $notoptions = wp_cache_get( 'notoptions', 'site-options' ); - $this->assertEmpty( $notoptions ); - $notoptions1 = wp_cache_get( $notoptions_key, 'site-options' ); - $this->assertNotEmpty( $notoptions1 ); - } - function test_users_can_register_signup_filter() { $registration = get_site_option( 'registration' ); Index: tests/phpunit/tests/option/networkOption.php =================================================================== --- tests/phpunit/tests/option/networkOption.php (revision 42412) +++ tests/phpunit/tests/option/networkOption.php (working copy) @@ -79,6 +79,19 @@ } /** + * @ticket 37181 + * @group ms-required + */ + public function test_meta_api_use_in_network_option() { + $network_id = self::factory()->network->create(); + $option = 'test_option_name'; + add_metadata( 'site', $network_id, $option, 'monday', true ); + add_metadata( 'site', $network_id, $option, 'tuesday', true ); + add_metadata( 'site', $network_id, $option, 'wednesday', true ); + $this->assertEquals( 'monday', get_network_option( $network_id, $option, true ) ); + } + + /** * @dataProvider data_network_id_parameter * * @param $network_id