WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure is set correctly when advanced-cache.php is being used. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-04-21 20:34:32 +00:00
parent 41a9873022
commit cbdf7e3aed
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/load.php
View File

@ -359,6 +359,11 @@ function wp_start_object_cache() {
$_wp_using_ext_object_cache = false; $_wp_using_ext_object_cache = false;
} }
$first_init = true; $first_init = true;
} else if ( !$_wp_using_ext_object_cache && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
// Sometimes advanced-cache.php can load object-cache.php before it is loaded here.
// This breaks the function_exists check above and can result in $_wp_using_ext_object_cache
// being set incorrectly. Double check if an external cache exists.
$_wp_using_ext_object_cache = true;
} }
// If cache supports reset, reset instead of init if already initialized. // If cache supports reset, reset instead of init if already initialized.