Remove db error show/hide, suppress/unsuppress in ms bootstrap. see #11644
git-svn-id: https://develop.svn.wordpress.org/trunk@12901 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
954968abef
commit
1f8632249d
|
@ -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];
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue