golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't cache default value in get_site_option() for non-existent options. Fixes #18955. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19012 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
duck_ 2011-10-19 21:06:50 +00:00
parent 16daac44ec
commit 148a9e8039
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/functions.php
View File

@ -3798,14 +3798,13 @@ function get_site_option( $option, $default = false, $use_cache = true ) {
$row = $wpdb->get_row( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
// Has to be get_row instead of get_var because of funkiness with 0, false, null values
if ( is_object( $row ) )
if ( is_object( $row ) ) {
$value = $row->meta_value;
else
$value = maybe_unserialize( $value );
wp_cache_set( $cache_key, $value, 'site-options' );
} else {
$value = $default;
$value = maybe_unserialize( $value );
wp_cache_set( $cache_key, $value, 'site-options' );
}
}
}