Changeset 31391

Timestamp:

02/09/2015 10:27:43 PM (10 years ago)

Author:

pento

Message:

WPDB: When checking to see if we can use utf8mb4, we also need to make sure PHP's MySQL client library is capable of using utf8mb4.

See #21212

File:

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

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

@@ -2802 +2802 @@
                 return version_compare( $version, '5.0.7', '>=' );
             case 'utf8mb4' :      // @since 4.1.0
-                return version_compare( $version, '5.5.3', '>=' );
+                if ( version_compare( $version, '5.5.3', '<' ) ) {
+                    return false;
+                }
+                if ( $this->use_mysqli ) {
+                    return mysqli_get_client_version( $this->dbh ) >= 50503;
+                } else {
+                    return mysql_get_client_version( $this->dbh ) >= 50503;
+                }
         }