From 2fb6d0bb5a7c5fc733e17cd8bcaf7a2095e55b69 Mon Sep 17 00:00:00 2001 From: donncha Date: Mon, 19 May 2008 15:04:49 +0000 Subject: Don't load the object cache when installing git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1297 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wp-settings.php') diff --git a/wp-settings.php b/wp-settings.php index 7e3bd7c..e02c967 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -247,7 +247,7 @@ if ( defined('CUSTOM_USER_TABLE') ) if ( defined('CUSTOM_USER_META_TABLE') ) $wpdb->usermeta = CUSTOM_USER_META_TABLE; -if ( file_exists(ABSPATH . 'wp-content/object-cache.php') ) +if ( !defined( 'WP_INSTALLING' ) && file_exists(ABSPATH . 'wp-content/object-cache.php') ) require_once (ABSPATH . 'wp-content/object-cache.php'); else require_once (ABSPATH . WPINC . '/cache.php'); -- cgit