diff --git a/wp-includes/class-wpdb.php b/wp-includes/class-wpdb.php index 816f8a13e5..81a43900f5 100644 --- a/wp-includes/class-wpdb.php +++ b/wp-includes/class-wpdb.php @@ -3376,12 +3376,21 @@ class wpdb { } // If any of the columns don't have one of these collations, it needs more sanity checking. + $safe_collations = array( + 'utf8_bin', + 'utf8_general_ci', + 'utf8mb3_bin', + 'utf8mb3_general_ci', + 'utf8mb4_bin', + 'utf8mb4_general_ci', + ); + foreach ( $this->col_meta[ $table ] as $col ) { if ( empty( $col->Collation ) ) { continue; } - if ( ! in_array( $col->Collation, array( 'utf8_general_ci', 'utf8_bin', 'utf8mb4_general_ci', 'utf8mb4_bin' ), true ) ) { + if ( ! in_array( $col->Collation, $safe_collations, true ) ) { return false; } } diff --git a/wp-includes/version.php b/wp-includes/version.php index d1b6f49403..ad759fe743 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-53917'; +$wp_version = '6.1-alpha-53918'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.