Changeset 17537

Timestamp:

03/23/2011 05:47:20 PM (14 years ago)

Author:

ryan

Message:

Don't die for failed db connects during install. Props westi. fixes #16640 for 3.1

File:

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

branches/3.1/wp-includes/wp-db.php

@@ -1052 +1052 @@
 
             // 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' ) )
+            // 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;