WordPress.org

Make WordPress Core

Changeset 12730


Ignore:
Timestamp:
01/15/2010 06:02:34 PM (11 years ago)
Author:
wpmuguru
Message:

fix multisite object cache warnings, $table_prefix assignment, See #11644

Location:
trunk/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/ms-functions.php

    r12709 r12730  
    309309        $current_user->_init_caps();
    310310
    311     if ( is_object( $wp_object_cache ) )
     311    if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
    312312        $global_groups = $wp_object_cache->global_groups;
    313313    else
     
    362362        $current_user->_init_caps();
    363363
    364     if ( is_object( $wp_object_cache ) )
     364    if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
    365365        $global_groups = $wp_object_cache->global_groups;
    366366    else
  • trunk/wp-includes/ms-load.php

    r12688 r12730  
    1818$wpdb->siteid           = $current_blog->site_id;
    1919$wpdb->set_prefix($table_prefix); // set up blog tables
    20 $table_prefix = $table_prefix . $blog_id . '_';
     20$table_prefix = $wpdb->get_blog_prefix();
    2121
    2222// Fix empty PHP_SELF
Note: See TracChangeset for help on using the changeset viewer.