Changeset 12730

Timestamp:

01/15/2010 06:02:34 PM (15 years ago)

Author:

wpmuguru

Message:

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

Location:

trunk/wp-includes

Files:

• ms-functions.php (modified) (2 diffs)
• ms-load.php (modified) (1 diff)

trunk/wp-includes/ms-functions.php

@@ -309 +309 @@
         $current_user->_init_caps();
 
-    if ( is_object( $wp_object_cache ) )
+    if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
         $global_groups = $wp_object_cache->global_groups;
     else
@@ -362 +362 @@
         $current_user->_init_caps();
 
-    if ( is_object( $wp_object_cache ) )
+    if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
         $global_groups = $wp_object_cache->global_groups;
     else

trunk/wp-includes/ms-load.php

@@ -18 +18 @@
 $wpdb->siteid           = $current_blog->site_id;
 $wpdb->set_prefix($table_prefix); // set up blog tables
-$table_prefix = $table_prefix . $blog_id . '_';
+$table_prefix = $wpdb->get_blog_prefix();
 
 // Fix empty PHP_SELF