Turn off object caching when WP_INSTALL is set

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1298 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 4 insertions, 0 deletions

diff --git a/wp-activate.php b/wp-activate.php
index 3819af6..3a81bcb 100644
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -3,6 +3,8 @@ define( "WP_INSTALLING", true );
 require ('wp-config.php');

 require_once( ABSPATH . WPINC . '/registration.php');

 

+if( is_object( $wp_object_cache ) ) $wp_object_cache->cache_enabled = false;

+

 do_action("activate_header");

 

 get_header();

diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index 97e6f76..1c9c618 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -1138,6 +1138,7 @@ function wpmu_create_user( $user_name, $password, $email) {
 }
 
 function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id = 1) {
+	global $wp_object_cache;
 	$domain = sanitize_user( $domain );
 	$title = strip_tags( $title );
 	$user_id = (int) $user_id;
@@ -1151,6 +1152,7 @@ function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id
 
 	if ( !defined("WP_INSTALLING") )
 		define( "WP_INSTALLING", true );
+	if( is_object( $wp_object_cache ) ) $wp_object_cache->cache_enabled = false;
 
 	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
 		return new WP_Error('insert_blog', __('Could not create blog.'));