WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Options: Do not set network options to autoload in single site 

When multisite is not configured, the `_site_transient()` and `_site_option()` functions fallback to `_option()` and store network "meta/options" in `wp_options`.

Previously, those calls to `_option()` did not explicitly set the `autoload` parameter and anything assigned as a transient or option at the network level would be set to `autoload` by default, even though autoload is not yet a concept at the network option level.

This changes that behavior and forces the `autoload` setting to `no`. If `autoload` is desired, the single site option functions should be used.

Props thomaswm.
Fixes #22846.

Built from https://develop.svn.wordpress.org/trunk@37223


git-svn-id: http://core.svn.wordpress.org/trunk@37189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-04-16 19:48:27 +00:00
parent 2cc9b6b410
commit f6620f7b7f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/option.php
View File

@ -1223,7 +1223,7 @@ function add_network_option( $network_id, $option, $value ) {
$notoptions_key = "$network_id:notoptions"; $notoptions_key = "$network_id:notoptions";
if ( ! is_multisite() ) { if ( ! is_multisite() ) {
$result = add_option( $option, $value ); $result = add_option( $option, $value, '', 'no' );
} else { } else {
$cache_key = "$network_id:$option"; $cache_key = "$network_id:$option";
@ -1431,7 +1431,7 @@ function update_network_option( $network_id, $option, $value ) {
} }
if ( ! is_multisite() ) { if ( ! is_multisite() ) {
$result = update_option( $option, $value ); $result = update_option( $option, $value, 'no' );
} else { } else {
$value = sanitize_option( $option, $value ); $value = sanitize_option( $option, $value );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37222'; $wp_version = '4.6-alpha-37223';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.