golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
ryan 2010-01-29 19:16:07 +00:00
parent 1de8e037c8
commit 19c9d0bb79
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/ms-load.php
View File

@ -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];

2
wp-includes/ms-settings.php
View File

@ -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