IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preload commonly loaded site options when running multisite without a persistent cache. Introduce wp_cache_reset() and call it instead of wp_cache_init() when re-initing after the blog ID chanages to avoid throwing out the entire cache. Pass cached site options through the site option filter when fetching.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13066 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2010-02-12 17:06:43 +00:00
parent b20c3c41d4
commit f97aa91a68
4 changed files with 115 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/load.php
View File

@@ -318,7 +318,8 @@ function wp_set_wpdb_vars() {
* @since 3.0.0
*/
function wp_start_object_cache() {
if ( ! function_exists( 'wp_cache_init' ) ) {
$first_init = false;
if ( ! function_exists( 'wp_cache_init' ) ) {
global $_wp_using_ext_object_cache;
if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
require_once ( WP_CONTENT_DIR . '/object-cache.php' );
@@ -327,9 +328,17 @@ function wp_start_object_cache() {
require_once ( ABSPATH . WPINC . '/cache.php' );
$_wp_using_ext_object_cache = false;
}
$first_init = true;
}
wp_cache_init();
// If cache supports reset, reset instead of init if already initialized.
// Reset signals to the cache that global IDs have changed and it may need to update keys
// and cleanup caches.
if ( !$first_init && function_exists('wp_cache_reset') )
wp_cache_reset();
else
wp_cache_init();
if ( function_exists( 'wp_cache_add_global_groups' ) ) {
wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss' ) );
wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );