Index: /trunk/wp-admin/setup-config.php =================================================================== --- /trunk/wp-admin/setup-config.php (revision 16787) +++ /trunk/wp-admin/setup-config.php (revision 16788) @@ -177,6 +177,8 @@ // We'll fail here if the values are no good. require_wp_db(); - if ( !empty($wpdb->error) ) - wp_die($wpdb->error->get_error_message()); + if ( ! empty( $wpdb->error ) ) { + $back = '
'; + wp_die( $wpdb->error->get_error_message() . $back ); + } // Fetch or generate keys and salts. Index: /trunk/wp-includes/wp-db.php =================================================================== --- /trunk/wp-includes/wp-db.php (revision 16787) +++ /trunk/wp-includes/wp-db.php (revision 16788) @@ -1045,5 +1045,9 @@ "/*/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(); }