diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-07 13:58:34 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-07-07 13:58:34 +0000 |
| commit | d3ab0af45aaa6a0135b497df0d7657635de900ab (patch) | |
| tree | b5e2b018246137dcd27ff595c0ae75c11b89de72 /wp-includes | |
| parent | 2c922569f544c74d172dce8cd88642ecb3e908b5 (diff) | |
| download | wordpress-mu-d3ab0af45aaa6a0135b497df0d7657635de900ab.tar.gz wordpress-mu-d3ab0af45aaa6a0135b497df0d7657635de900ab.tar.xz wordpress-mu-d3ab0af45aaa6a0135b497df0d7657635de900ab.zip | |
Added is_switched()
Only store "novalueindb" values for 5 seconds
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@642 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes')
| -rw-r--r-- | wp-includes/functions.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 30a5360..294d469 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -164,10 +164,20 @@ function maybe_unserialize($original) { /* Options functions */ +function is_switched( $setting = 'N/A' ) { + global $switched; + if ( $switched == false && defined('WP_INSTALLING') == false && $_REQUEST['nomemcache'] != 'all' && $_REQUEST['nomemcache'] != $setting ) { + return false; + } else { + return true; + } + +} + function get_settings($setting) { global $wpdb, $switched, $current_blog; - if ( $switched == false && defined('WP_INSTALLING') == false && $_REQUEST['nomemcache'] != 'all' && $_REQUEST['nomemcache'] != $setting ) { + if ( is_switched() == false ) { $value = wp_cache_get($setting, 'options'); } else { $value = false; @@ -194,7 +204,7 @@ function get_settings($setting) { $value = $row->option_value; wp_cache_set($setting, ($value=='')?'emptystringindb':$value, 'options'); } else { - wp_cache_set($setting, 'novalueindb', 'options'); + wp_cache_set($setting, 'novalueindb', 'options', 5); return false; } } |