From 19c9d0bb79503a95ccab4ceb305d8d881187e1ba Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 29 Jan 2010 19:16:07 +0000
Subject: [PATCH] Remove db error show/hide, suppress/unsuppress in ms
 bootstrap. see #11644

git-svn-id: http://svn.automattic.com/wordpress/trunk@12901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-load.php     | 5 -----
 wp-includes/ms-settings.php | 2 --
 2 files changed, 7 deletions(-)

diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index 3395e4b0f8..ea8293d84e 100644
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -30,8 +30,6 @@ function ms_network_settings() {
 
 	if ( $current_site->site_name == false )
 		$current_site->site_name = ucfirst( $current_site->domain );
-
-	$wpdb->hide_errors();
 }
 
 function ms_network_plugins() {
@@ -67,8 +65,6 @@ function ms_network_plugins() {
 function ms_site_check() {
 	global $wpdb, $current_blog;
 
-	$wpdb->show_errors();
-
 	if ( '1' == $current_blog->deleted ) {
 			if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
 					return WP_CONTENT_DIR . '/blog-deleted.php';
@@ -129,7 +125,6 @@ function wpmu_current_site() {
 	if ( $current_site )
 		return $current_site;
 
-	$wpdb->suppress_errors();
 	$sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site
 	if ( count( $sites ) == 1 ) {
 		$current_site = $sites[0];
diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
index b9467c8731..903057c37a 100644
--- a/wp-includes/ms-settings.php
+++ b/wp-includes/ms-settings.php
@@ -115,8 +115,6 @@ if ( ! $blog_id ) {
     }
 }
 
-$wpdb->suppress_errors( false );
-
 $wpdb->blogid = $current_blog->blog_id;
 $wpdb->siteid = $current_blog->site_id;
 $wpdb->set_prefix( $table_prefix ); // set up blog tables