From d93dcaf75f218a1230a3b9be8a375bfdeffc876e Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Thu, 28 Sep 2017 07:57:22 +0000 Subject: [PATCH] Setup: Hide database errors while testing the table prefix. If DB errors are shown during installation, the table prefix test will also show an error, even though we're deliberately trying to generate that error. Fixes #40655. git-svn-id: https://develop.svn.wordpress.org/trunk@41631 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/setup-config.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php index c1fe1eb808..e416931d00 100644 --- a/src/wp-admin/setup-config.php +++ b/src/wp-admin/setup-config.php @@ -276,7 +276,9 @@ switch($step) { if ( ! empty( $wpdb->error ) ) wp_die( $wpdb->error->get_error_message() . $tryagain_link ); + $errors = $wpdb->hide_errors(); $wpdb->query( "SELECT $prefix" ); + $wpdb->show_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.' ) );