Ticket #21212: 21212-utf8mb4.3.diff

wp-includes/wp-db.php

@@ -545 +545 @@
          * @param string   $collate The collation (optional)
          */
         function set_charset($dbh, $charset = null, $collate = null) {
+                if ( $this->has_cap( 'utf8mb4' ) ) {
+                        if ( 'utf8' == $this->charset )
+                                $this->charset = 'utf8mb4';
+
+                        if ( strpos( $this->charset, 'utf8_' ) === 0 )
+                                $this->charset = str_replace( 'utf8_', 'utf8mb4_', $this->charset );
+                }
+
                 if ( !isset($charset) )
                         $charset = $this->charset;
                 if ( !isset($collate) )
@@ -1575 +1583 @@
                                 return version_compare( $version, '4.1', '>=' );
                         case 'set_charset' :
                                 return version_compare($version, '5.0.7', '>=');
+                        case 'utf8mb4':
+                                return version_compare($version, '5.5.3', '>=');
                 };
 
                 return false;