Wordpress 3.1.3

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

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index e9b4e6fb1f29bce5fba2939a505403617f9c2482..d9e70865819f165f888c23bb7ccc2dd42f705ffd 100644 (file)
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -1050,12 +1050,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 );