Index: /trunk/wp-settings.php
===================================================================
--- /trunk/wp-settings.php (revision 10512)
+++ /trunk/wp-settings.php (revision 10513)
@@ -258,8 +258,11 @@
wp_die(/*WP_I18N_BAD_PREFIX*/'ERROR: $table_prefix
in wp-config.php
can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/);
-if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') )
+if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') ) {
require_once (WP_CONTENT_DIR . '/object-cache.php');
-else
+ $_wp_using_ext_object_cache = true;
+} else {
require_once (ABSPATH . WPINC . '/cache.php');
+ $_wp_using_ext_object_cache = false;
+}
wp_cache_init();