In `get_site_option()` and `get_option()`, ensure that `$notoptions` is an array before writing to it. Prevents a flood of `Cannot use a scalar value as an array`, because `$notoptions` is otherwise set to the result of `wp_cache_get()`, which returns `mixed`.
Props hauvong. Fixes #31147. git-svn-id: https://develop.svn.wordpress.org/trunk@32943 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
6690882fc1
commit
4d28f9a7de
|
@ -83,6 +83,9 @@ function get_option( $option, $default = false ) {
|
|||
$value = $row->option_value;
|
||||
wp_cache_add( $option, $value, 'options' );
|
||||
} else { // option does not exist, so we must cache its non-existence
|
||||
if ( ! is_array( $notoptions ) ) {
|
||||
$notoptions = array();
|
||||
}
|
||||
$notoptions[$option] = true;
|
||||
wp_cache_set( 'notoptions', $notoptions, 'options' );
|
||||
|
||||
|
@ -1024,6 +1027,9 @@ function get_site_option( $option, $default = false, $use_cache = true ) {
|
|||
$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' );
|
||||
|
||||
|
|
Loading…
Reference in New Issue