summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-11-18 14:17:56 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-11-18 14:17:56 +0000
commitefcb857423cc3556d2283152cc1de82f6c56cc74 (patch)
tree16088d1463f61dedf19dcf1aba3c7a5b4c43921a
parent56777d417dd3fefd42e44db4f60377709fccdf5a (diff)
Disable caching when upgrading/installing
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@441 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r--wp-inst/wp-includes/functions.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index 1fb41e6..4fc8df2 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -262,7 +262,11 @@ function url_to_postid($url) {
function get_settings($setting) {
global $wpdb;
- $value = wp_cache_get($setting, 'options');
+ if ( defined('WP_INSTALLING') == false ) {
+ $value = wp_cache_get($setting, 'options');
+ } else {
+ $value = false;
+ }
if ( false === $value ) {
if ( defined('WP_INSTALLING') )