From f1d335052d65fe0e1f038bd1edad26ecdeaaf23b Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 5 Feb 2009 22:01:39 +0000 Subject: [PATCH] Flag if using external object cache. see #9048 git-svn-id: http://svn.automattic.com/wordpress/trunk@10513 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-settings.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index 553c67d4b7..4a35fb8761 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -257,10 +257,13 @@ $prefix = $wpdb->set_prefix($table_prefix); if ( is_wp_error($prefix) ) 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(); if ( function_exists('wp_cache_add_global_groups') ) {