diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-05-19 15:04:49 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-05-19 15:04:49 +0000 |
| commit | 2fb6d0bb5a7c5fc733e17cd8bcaf7a2095e55b69 (patch) | |
| tree | e0a7b4b0e2b4bfa8c6527f73ec7bf67169900c5c /wp-settings.php | |
| parent | 4ba031aeea57b05b6bfd6dc7efa1fa48835487c0 (diff) | |
| download | wordpress-mu-2fb6d0bb5a7c5fc733e17cd8bcaf7a2095e55b69.tar.gz wordpress-mu-2fb6d0bb5a7c5fc733e17cd8bcaf7a2095e55b69.tar.xz wordpress-mu-2fb6d0bb5a7c5fc733e17cd8bcaf7a2095e55b69.zip | |
Don't load the object cache when installing
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1297 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
| -rw-r--r-- | wp-settings.php | 2 |
1 files changed, 1 insertions, 1 deletions
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'); |