Wordpress 3.6-scripts

[autoinstalls/wordpress.git] / wp-includes / ms-settings.php

diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
index 5dd460e301ad57298a007ec044a10ca9cd9670b6..af2ea0d97add9b602747d782ec646bf487c00eb8 100644 (file)
--- a/wp-includes/ms-settings.php
+++ b/wp-includes/ms-settings.php
@@ -126,6 +126,8 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
 $wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php
 $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
 $table_prefix = $wpdb->get_blog_prefix();
+$_wp_switched_stack = array();
+$switched = false;
 
 // need to init cache again after blog_id is set
 wp_start_object_cache();