diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index b1b7a16ccb..bf5e1c84c3 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -311,9 +311,10 @@ switch ( $step ) { wp_die( $wpdb->error->get_error_message() . $tryagain_link ); } - $errors = $wpdb->hide_errors(); + $errors = $wpdb->suppress_errors(); $wpdb->query( "SELECT $prefix" ); - $wpdb->show_errors( $errors ); + $wpdb->suppress_errors( $errors ); + if ( ! $wpdb->last_error ) { // MySQL was able to parse the prefix as a value, which we don't want. Bail. wp_die( __( 'Error: "Table Prefix" is invalid.' ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 098bd4f8d3..ebba86053b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-53811'; +$wp_version = '6.1-alpha-53812'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.