Changeset 1298

Show
Ignore:
Timestamp:
05/19/08 15:22:13 (4 months ago)
Author:
donncha
Message:

Turn off object caching when WP_INSTALL is set

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-activate.php

    r942 r1298  
    33require ('wp-config.php'); 
    44require_once( ABSPATH . WPINC . '/registration.php'); 
     5 
     6if( is_object( $wp_object_cache ) ) $wp_object_cache->cache_enabled = false; 
    57 
    68do_action("activate_header"); 

  • trunk/wp-includes/wpmu-functions.php

    r1283 r1298  
    11391139 
    11401140function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id = 1) { 
     1141        global $wp_object_cache; 
    11411142        $domain = sanitize_user( $domain ); 
    11421143        $title = strip_tags( $title ); 
    …… 
    11521153        if ( !defined("WP_INSTALLING") ) 
    11531154                define( "WP_INSTALLING", true ); 
     1155        if( is_object( $wp_object_cache ) ) $wp_object_cache->cache_enabled = false; 
    11541156 
    11551157        if ( ! $blog_id = insert_blog($domain, $path, $site_id) )