Ticket #32051: 32051.diff

src/wp-includes/wp-db.php

@@ -2534 +2534 @@
 
                 if ( $db_check_string ) {
                         $queries = array();
-                        foreach ( $data as $col => $value ) {
+                        foreach ( $data as $col => &$value ) {
                                 if ( ! empty( $value['db'] ) ) {
                                         if ( ! isset( $queries[ $value['charset'] ] ) ) {
                                                 $queries[ $value['charset'] ] = array();
@@ -2542 +2542 @@
 
                                         // Split the CONVERT() calls by charset, so we can make sure the connection is right
                                         $queries[ $value['charset'] ][ $col ] = $this->prepare( "CONVERT( %s USING {$value['charset']} )", $value['value'] );
+                                        unset( $value['db'] );
                                 }
                         }
 

tests/phpunit/tests/db/charset.php

@@ -59 +59 @@
                                 'charset'  => 'koi8r',
                                 'value'    => "\xfdord\xf2ress",
                                 'expected' => "\xfdord\xf2ress",
-                                'db'       => true
                         ),
                         'hebrew' => array(
                                 // hebrew needs to be checked in MySQL, too
@@ -66 +65 @@
                                 'charset'  => 'hebrew',
                                 'value'    => "\xf9ord\xf7ress",
                                 'expected' => "\xf9ord\xf7ress",
-                                'db'       => true
                         ),
                         'false' => array(
                                 // false is a column with no character set (ie, a number column)