summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/functions.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-09-12 12:29:51 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-09-12 12:29:51 +0000
commit0b264641bbaef7c30daea21f82cd30c1cf3d0739 (patch)
treed574ad172c21d37411f47bee561c782c5a9913b1 /wp-inst/wp-includes/functions.php
parent17b92e46a4a71258cdab6ab6c298b7c48ec9fc25 (diff)
downloadwordpress-mu-0b264641bbaef7c30daea21f82cd30c1cf3d0739.tar.gz
wordpress-mu-0b264641bbaef7c30daea21f82cd30c1cf3d0739.tar.xz
wordpress-mu-0b264641bbaef7c30daea21f82cd30c1cf3d0739.zip
If installing then don't use the settings cache!
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@315 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/functions.php')
-rw-r--r--wp-inst/wp-includes/functions.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index d730d6a..1d81cf1 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -373,8 +373,10 @@ function add_option($name, $value = '', $description = '', $autoload = 'yes') {
global $wpdb, $cache_settings;
// Make sure the option doesn't already exist
- if ( isset($cache_settings->$name) )
- return;
+ if( defined( "WP_INSTALLING" ) == false ) {
+ if ( isset($cache_settings->$name) )
+ return;
+ }
$original = $value;
if ( is_array($value) || is_object($value) )