Hide/stop signup db errors

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@564 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 5 insertions, 3 deletions

diff --git a/wp-inst/wp-includes/wpmu-functions.php b/wp-inst/wp-includes/wpmu-functions.php
index f96a96e..dc87ab7 100644
--- a/wp-inst/wp-includes/wpmu-functions.php
+++ b/wp-inst/wp-includes/wpmu-functions.php
@@ -82,7 +82,7 @@ if( defined( "WP_INSTALLING" ) == false ) {
 function get_blogaddress_by_id( $blog_id ) {
 	global $hostname, $domain, $base, $wpdb;
 
-	$bloginfo = get_blog_details( $blog_id );
+	$bloginfo = get_blog_details( $blog_id, false ); // only get bare details!
 
 	if( defined( "VHOST" ) && constant( "VHOST" ) == 'yes' ) {
 		return "http://" . $bloginfo->domain . $bloginfo->path;
@@ -377,7 +377,9 @@ function switch_to_blog( $new_blog ) {
 	//$wp_object_cache->cache_enabled = false;
 	wp_cache_flush();
 	wp_cache_close();
+	$wpdb->hide_errors();
 	$wp_roles->_init();
+	$wpdb->show_errors();
 	wp_cache_init();
 
 	do_action('switch_blog', $blog_id, $tmpoldblogdetails[ 'blog_id' ]);
@@ -1170,7 +1172,7 @@ function insert_blog($domain, $path, $site_id) {
 
 // Install an empty blog.  wpdb should already be switched.
 function install_blog($blog_id, $blog_title = '') {
-	global $wpdb, $table_prefix;
+	global $wpdb, $table_prefix, $wp_roles;
 	$wpdb->hide_errors();
 
 	require_once( ABSPATH . 'wp-admin/upgrade-functions.php');
@@ -1184,7 +1186,7 @@ function install_blog($blog_id, $blog_title = '') {
 	make_db_current_silent();
 	populate_options();
 	populate_roles();
-
+	$wp_roles->_init();
 	// fix url.
 	update_option('siteurl', $url);
 	update_option('home', $url);