Changeset 31939

Timestamp:

03/31/2015 09:17:43 AM (12 years ago)

Author:

pento

Message:

WPDB: When we're checking to see if the MySQL client library supports utf8mb4, we need a separate check for mysqlnd versions, which using different version numbering to libmysqlclient.

Props MattyRob.

Fixes #31644.

File:

• trunk/src/wp-includes/wp-db.php (modified) (1 diff)

trunk/src/wp-includes/wp-db.php

@@ -2811 +2811 @@
                                 }
 
-                                return version_compare( $client_version, '5.5.3', '>=' );
+                                /*
+                                 * libmysql has supported utf8mb4 since 5.5.3, same as the MySQL server.
+                                 * mysqlnd has supported utf8mb4 since 5.0.9.
+                                 */
+                                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', '>=' );
+                                }
                 }