WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects 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. 

See #21212.

Built from https://develop.svn.wordpress.org/trunk@30375


git-svn-id: http://core.svn.wordpress.org/trunk@30372 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2014-11-18 03:38:23 +00:00
parent e2a0c6a86d
commit 739a20a659
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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;
} }