Wordpress 3.1.4

[autoinstalls/wordpress.git] / wp-includes / wp-db.php

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index e9b4e6fb1f29bce5fba2939a505403617f9c2482..a90c2814d01ba7ed0e97df0c1e5a7fc540bd979f 100644 (file)
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -644,6 +644,7 @@ class wpdb {
                if ( is_multisite() ) {
                        if ( null === $blog_id )
                                $blog_id = $this->blogid;
+                       $blog_id = (int) $blog_id;
                        if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) )
                                return $this->base_prefix;
                        else
@@ -1050,12 +1051,7 @@ class wpdb {
 <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
 "/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
 
-                       // If show errors is disabled then we need to die anyway as we don't have a working DB connection
-                       // unless we're trying to test the initial connection, in which case setup-config.php will handle.
-                       if ( defined( 'WP_SETUP_CONFIG' ) )
-                               return;
-
-                       die();
+                       return;
                }
 
                $this->set_charset( $this->dbh );