Make WordPress Core

Ticket #32165: 32165.diff

File 32165.diff, 592 bytes (added by kraftbj, 10 years ago)

Exactly same as OP patch except attached and diff'd from trunk's root.

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

     
    25902590                $db_check_string = false;
    25912591
    25922592                foreach ( $data as &$value ) {
    2593                         $charset = $value['charset'];
     2593                        if ($value['charset'] !== $this->charset) {
     2594                                $charset = $this->charset;
     2595                        } else {
     2596                                $charset = $value['charset'];
     2597                        }
    25942598
    25952599                        // Column isn't a string, or is latin1, which will will happily store anything.
    25962600                        if ( false === $charset || 'latin1' === $charset ) {