summaryrefslogtreecommitdiffstats
path: root/wp-includes
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-06-04 15:46:25 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-06-04 15:46:25 +0000
commit2a639e32577b2bd38b6f12399e1b8f47deee23ec (patch)
tree0d963ea6727a5b0a0e3ae80c9d1bc50d6baa8b20 /wp-includes
parent22434cb1c49a1b425b5fdc6275968c377620a6eb (diff)
downloadwordpress-mu-2a639e32577b2bd38b6f12399e1b8f47deee23ec.tar.gz
wordpress-mu-2a639e32577b2bd38b6f12399e1b8f47deee23ec.tar.xz
wordpress-mu-2a639e32577b2bd38b6f12399e1b8f47deee23ec.zip
No need forthis debugging code
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1319 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes')
-rw-r--r--wp-includes/wpmu-functions.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index a6dd763..03c4b53 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -322,7 +322,7 @@ function update_blog_option( $id, $key, $value, $refresh = true ) {
}
function switch_to_blog( $new_blog ) {
- global $wpdb, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache, $switched_to;
+ global $wpdb, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache;
if ( empty($new_blog) )
return;
@@ -339,7 +339,6 @@ function switch_to_blog( $new_blog ) {
$table_prefix = $wpdb->prefix;
$prev_blog_id = $blog_id;
$blog_id = $new_blog;
- $switched_to = $blog_id;
if( is_object( $wp_roles ) ) {
$wpdb->suppress_errors();
@@ -355,7 +354,7 @@ function switch_to_blog( $new_blog ) {
}
function restore_current_blog() {
- global $table_prefix, $wpdb, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache, $switched_to;
+ global $table_prefix, $wpdb, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache;
if ( !$switched )
return;
@@ -368,7 +367,6 @@ function restore_current_blog() {
$prev_blog_id = $blog_id;
$blog_id = $blog;
$table_prefix = $wpdb->prefix;
- $switched_to = $blog_id;
if( is_object( $wp_roles ) ) {
$wpdb->suppress_errors();
@@ -1141,7 +1139,6 @@ function wpmu_create_user( $user_name, $password, $email) {
}
function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id = 1) {
- global $wp_object_cache;
$domain = sanitize_user( $domain );
$title = strip_tags( $title );
$user_id = (int) $user_id;
@@ -1155,7 +1152,6 @@ function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id
if ( !defined("WP_INSTALLING") )
define( "WP_INSTALLING", true );
- if( is_object( $wp_object_cache ) ) $wp_object_cache->cache_enabled = false;
if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
return new WP_Error('insert_blog', __('Could not create blog.'));