sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WPDB: When a db.php drop-in is being used, and it doesn't explicitly define itself as connecting to MySQL, skip the character set checks. This ensures that existing drop-ins won't accidentally run checks that they don't support.

Browse Source 
See #21212.


git-svn-id: https://develop.svn.wordpress.org/trunk@30375 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast 2014-11-18 03:37:23 +00:00
parent 92ae13f0ee
commit de33d35d1f
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wp-includes/wp-db.php
View File

@ -2211,7 +2211,7 @@ class wpdb {
$this->col_meta[ $table ] = $columns; $this->col_meta[ $table ] = $columns;
foreach ( $columns as $column ) { foreach ( $columns as $column ) {
if ( $column->Collation ) { if ( ! empty( $column->Collation ) ) {
list( $charset ) = explode( '_', $column->Collation ); list( $charset ) = explode( '_', $column->Collation );
$charsets[ strtolower( $charset ) ] = true; $charsets[ strtolower( $charset ) ] = true;
} }
@ -2237,7 +2237,7 @@ class wpdb {
$charset = key( $charsets ); $charset = key( $charsets );
} elseif ( 0 === $count ) { } elseif ( 0 === $count ) {
// No charsets, assume this table can store whatever. // No charsets, assume this table can store whatever.
$charset = 'latin1'; $charset = false;
} else { } else {
// More than one charset. Remove latin1 if present and recalculate. // More than one charset. Remove latin1 if present and recalculate.
unset( $charsets['latin1'] ); unset( $charsets['latin1'] );
@ -2291,6 +2291,11 @@ class wpdb {
return $charset; return $charset;
} }
// Skip this entirely if this isn't a MySQL database.
if ( false === $this->is_mysql ) {
return false;
}
if ( empty( $this->table_charset[ $table ] ) ) { if ( empty( $this->table_charset[ $table ] ) ) {
// This primes column information for us. // This primes column information for us.
$table_charset = $this->get_table_charset( $table ); $table_charset = $this->get_table_charset( $table );
@ -2378,13 +2383,12 @@ class wpdb {
foreach ( $data as &$value ) { foreach ( $data as &$value ) {
$charset = $value['charset']; $charset = $value['charset'];
// latin1 will happily store anything. // Column isn't a string, or is latin1, which will will happily store anything.
if ( 'latin1' === $charset ) { if ( false === $charset || 'latin1' === $charset ) {
continue; continue;
} }
// Column or value isn't a string. if ( ! is_string( $value['value'] ) ) {
if ( false === $charset || ! is_string( $value['value'] ) ) {
continue; continue;
} }

28
tests/phpunit/tests/db/charset.php
View File

@ -231,7 +231,7 @@ class Tests_DB_Charset extends WP_UnitTestCase {
protected $table_and_column_defs = array( protected $table_and_column_defs = array(
array( array(
'definition' => '( a INT, b FLOAT )', 'definition' => '( a INT, b FLOAT )',
'table_expected' => 'latin1', 'table_expected' => false,
'column_expected' => array( 'a' => false, 'b' => false ) 'column_expected' => array( 'a' => false, 'b' => false )
), ),
array( array(
@ -346,6 +346,32 @@ class Tests_DB_Charset extends WP_UnitTestCase {
self::$_wpdb->query( $drop ); self::$_wpdb->query( $drop );
} }
/**
* @dataProvider data_test_get_column_charset
* @ticket 21212
*/
function test_get_column_charset_non_mysql( $drop, $create, $table, $columns ) {
self::$_wpdb->query( $drop );
if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
$this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
return;
}
self::$_wpdb->is_mysql = false;
self::$_wpdb->query( $create );
$columns = array_keys( $columns );
foreach ( $columns as $column => $charset ) {
$this->assertEquals( false, self::$_wpdb->get_col_charset( $table, $column ) );
}
self::$_wpdb->query( $drop );
self::$_wpdb->is_mysql = true;
}
/** /**
* @ticket 21212 * @ticket 21212
*/ */