Changeset 17546

Timestamp:

03/23/11 19:57:35 (3 years ago)

Author:

ryan

Message:

Don't die inside db_connect() if connection fails. Let dead_db() handle it. fixes #16640 for trunk

File:

• trunk/wp-includes/wp-db.php (modified) (1 diff)

trunk/wp-includes/wp-db.php

@@ -1049 +1049 @@
 "/*/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/install.php will handle.
-            if ( defined( 'WP_SETUP_CONFIG' ) || defined( 'WP_INSTALLING' ) )
-                return;
-
-            die();
+            return;
         }