Changeset 16788 for trunk/wp-includes/wp-db.php

Timestamp:

12/08/2010 07:12:44 AM (14 years ago)

Author:

nacin

Message:

Don't improperly whitescreen on incorrect DB credentials during setup-config. Show error message with an opportunity to try again. fixes #15682.

File:

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

trunk/wp-includes/wp-db.php

@@ -1045 +1045 @@
 "/*/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
+            // 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();
         }