summaryrefslogtreecommitdiffstats
path: root/wp-includes/functions.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-06-24 14:44:11 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-06-24 14:44:11 +0000
commita1fbe4e0694a66d7351e2f6280ab84568681e8e0 (patch)
treefaabaf7344b5bb8eb1545f0e0b87f67ad6e80ae3 /wp-includes/functions.php
parent5778777a0dbfc5ea71a71ecac00be211f00aecd1 (diff)
downloadwordpress-mu-a1fbe4e0694a66d7351e2f6280ab84568681e8e0.tar.gz
wordpress-mu-a1fbe4e0694a66d7351e2f6280ab84568681e8e0.tar.xz
wordpress-mu-a1fbe4e0694a66d7351e2f6280ab84568681e8e0.zip
When installing, disable the option cache, fixes #663
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1335 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/functions.php')
-rw-r--r--wp-includes/functions.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index a4a5914..6bf934d 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -282,6 +282,9 @@ function wp_load_alloptions() {
function _get_option_cache( $setting ) {
global $_wp_alloptions;
global $blog_id;
+
+ if( defined( 'WP_INSTALLING' ) )
+ return false;
wp_load_alloptions();