Changeset 57926 for trunk/src/wp-includes/class-wpdb.php

Timestamp:

04/04/2024 03:11:37 PM (12 months ago)

Author:

johnbillion

Message:

Database: Remove back-compat for database servers that don't support utf8mb4.

Since WordPress 6.5, the minimum supported version of MySQL and MariaDB is 5.5.5. This means all supported database servers now support the utf8mb4 character set and therefore the conditional logic for this is no longer necessary.

Props l1nuxjedi, craigfrancis, OllieJones, johnbillion

Fixes #60096

File:

• trunk/src/wp-includes/class-wpdb.php (modified) (4 diffs)

trunk/src/wp-includes/class-wpdb.php

@@ -879 +879 @@
         }
 
-        if ( 'utf8' === $charset && $this->has_cap( 'utf8mb4' ) ) {
+        if ( 'utf8' === $charset ) {
             $charset = 'utf8mb4';
-        }
-
-        if ( 'utf8mb4' === $charset && ! $this->has_cap( 'utf8mb4' ) ) {
-            $charset = 'utf8';
-            $collate = str_replace( 'utf8mb4_', 'utf8_', $collate );
         }
 
@@ -3243 +3238 @@
                 list( $charset ) = explode( '_', $column->Collation );
 
-                // If the current connection can't support utf8mb4 characters, let's only send 3-byte utf8 characters.
-                if ( 'utf8mb4' === $charset && ! $this->has_cap( 'utf8mb4' ) ) {
-                    $charset = 'utf8';
-                }
-
                 $charsets[ strtolower( $charset ) ] = true;
             }
@@ -4058 +4048 @@
      * @since 4.6.0 Added support for the 'utf8mb4_520' feature.
      * @since 6.2.0 Added support for the 'identifier_placeholders' feature.
+     * @since 6.6.0 The `utf8mb4` feature now always returns true.
      *
      * @see wpdb::db_version()
@@ -4093 +4084 @@
                 return version_compare( $db_version, '5.0.7', '>=' );
             case 'utf8mb4':      // @since 4.1.0
-                if ( version_compare( $db_version, '5.5.3', '<' ) ) {
-                    return false;
-                }
-
-                $client_version = mysqli_get_client_info();
-
-                /*
-                 * libmysql has supported utf8mb4 since 5.5.3, same as the MySQL server.
-                 * mysqlnd has supported utf8mb4 since 5.0.9.
-                 *
-                 * Note: str_contains() is not used here, as this file can be included
-                 * directly outside of WordPress core, e.g. by HyperDB, in which case
-                 * the polyfills from wp-includes/compat.php are not loaded.
-                 */
-                if ( false !== strpos( $client_version, 'mysqlnd' ) ) {
-                    $client_version = preg_replace( '/^\D+([\d.]+).*/', '$1', $client_version );
-                    return version_compare( $client_version, '5.0.9', '>=' );
-                } else {
-                    return version_compare( $client_version, '5.5.3', '>=' );
-                }
+                return true;
             case 'utf8mb4_520': // @since 4.6.0
                 return version_compare( $db_version, '5.6', '>=' );