From a1fbe4e0694a66d7351e2f6280ab84568681e8e0 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 24 Jun 2008 14:44:11 +0000
Subject: When installing, disable the option cache, fixes #663

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1335 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/functions.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'wp-includes/functions.php')

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();
 
-- 
cgit