Changeset 1319
- Timestamp:
- 06/04/08 15:46:25 (4 months ago)
- Files:
-
- trunk/wp-includes/wpmu-functions.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/wp-includes/wpmu-functions.php
r1318 r1319 323 323 324 324 function switch_to_blog( $new_blog ) { 325 global $wpdb, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache , $switched_to;325 global $wpdb, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache; 326 326 327 327 if ( empty($new_blog) ) … … 340 340 $prev_blog_id = $blog_id; 341 341 $blog_id = $new_blog; 342 $switched_to = $blog_id;343 342 344 343 if( is_object( $wp_roles ) ) { … … 356 355 357 356 function restore_current_blog() { 358 global $table_prefix, $wpdb, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache , $switched_to;357 global $table_prefix, $wpdb, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache; 359 358 360 359 if ( !$switched ) … … 369 368 $blog_id = $blog; 370 369 $table_prefix = $wpdb->prefix; 371 $switched_to = $blog_id;372 370 373 371 if( is_object( $wp_roles ) ) { … … 1142 1140 1143 1141 function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id = 1) { 1144 global $wp_object_cache;1145 1142 $domain = sanitize_user( $domain ); 1146 1143 $title = strip_tags( $title ); … … 1156 1153 if ( !defined("WP_INSTALLING") ) 1157 1154 define( "WP_INSTALLING", true ); 1158 if( is_object( $wp_object_cache ) ) $wp_object_cache->cache_enabled = false;1159 1155 1160 1156 if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
