Index: wp-includes/wp-db.php =================================================================== --- wp-includes/wp-db.php (revision 16785) +++ wp-includes/wp-db.php (working copy) @@ -1045,6 +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 ( defined( 'WP_SETUP_CONFIG' ) ) + return; + die(); } Index: wp-admin/setup-config.php =================================================================== --- wp-admin/setup-config.php (revision 16785) +++ wp-admin/setup-config.php (working copy) @@ -176,8 +176,10 @@ // 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. $no_api = isset( $_POST['noapi'] );