WordPress.org

Make WordPress Core

Changeset 12888


Ignore:
Timestamp:
01/28/10 17:28:44 (5 years ago)
Author:
ryan
Message:

Clean up cache re-init code in Multisite. Props nacin. fixes #12065

Location:
trunk/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/load.php

    r12885 r12888  
    319319 */ 
    320320function wp_start_object_cache() { 
    321     global $_wp_using_ext_object_cache; 
    322     if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) { 
    323         require_once ( WP_CONTENT_DIR . '/object-cache.php' ); 
    324         $_wp_using_ext_object_cache = true; 
    325     } else { 
    326         require_once ( ABSPATH . WPINC . '/cache.php' ); 
    327         $_wp_using_ext_object_cache = false; 
     321    if ( ! function_exists( 'wp_cache_init' ) ) { 
     322        global $_wp_using_ext_object_cache; 
     323        if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) { 
     324            require_once ( WP_CONTENT_DIR . '/object-cache.php' ); 
     325            $_wp_using_ext_object_cache = true; 
     326        } else { 
     327            require_once ( ABSPATH . WPINC . '/cache.php' ); 
     328            $_wp_using_ext_object_cache = false; 
     329        } 
    328330    } 
    329331 
  • trunk/wp-includes/ms-settings.php

    r12885 r12888  
    153153    $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]); 
    154154 
    155 wp_cache_init(); // need to init cache again after blog_id is set 
    156 if ( function_exists('wp_cache_add_global_groups') ) { // need to add these again. Yes, it's an ugly hack 
    157     wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss')); 
    158     wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' )); 
    159 } 
     155// need to init cache again after blog_id is set 
     156wp_start_object_cache(); 
    160157 
    161158ms_default_constants( 'uploads' ); 
Note: See TracChangeset for help on using the changeset viewer.