Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-23 13:24:57 +02:00
Code Issues Projects Releases Wiki Activity

WPDB: When looking up the character set for a table or column, make sure we send the table name to MySQL in the correct case, as MySQL can be configured with case sensitive table names.

Browse Source 
Fixes #30538.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30689 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2014-12-02 03:00:23 +00:00
parent cb5c43df83
commit de6d84935f
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.1-beta2-30698';
$wp_version = '4.1-beta2-30699';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

30
wp-includes/wp-db.php
View File

@ -2164,7 +2164,7 @@ class wpdb {
* @return string|WP_Error Table character set, {@see WP_Error} object if it couldn't be found.
*/
protected function get_table_charset( $table ) {
$table = strtolower( $table );
$tablekey = strtolower( $table );
/**
* Filter the table charset value before the DB is checked.
@ -2182,8 +2182,8 @@ class wpdb {
return $charset;
}
if ( isset( $this->table_charset[ $table ] ) ) {
return $this->table_charset[ $table ];
if ( isset( $this->table_charset[ $tablekey ] ) ) {
return $this->table_charset[ $tablekey ];
}
$charsets = $columns = array();
@ -2196,7 +2196,7 @@ class wpdb {
$columns[ strtolower( $column->Field ) ] = $column;
}
$this->col_meta[ $table ] = $columns;
$this->col_meta[ $tablekey ] = $columns;
foreach ( $columns as $column ) {
if ( ! empty( $column->Collation ) ) {
@ -2208,7 +2208,7 @@ class wpdb {
// A binary/blob means the whole query gets treated like this.
if ( in_array( strtoupper( $type ), array( 'BINARY', 'VARBINARY', 'TINYBLOB', 'MEDIUMBLOB', 'BLOB', 'LONGBLOB' ) ) ) {
$this->table_charset[ $table ] = 'binary';
$this->table_charset[ $tablekey ] = 'binary';
return 'binary';
}
}
@ -2242,7 +2242,7 @@ class wpdb {
}
}
$this->table_charset[ $table ] = $charset;
$this->table_charset[ $tablekey ] = $charset;
return $charset;
}
@ -2258,8 +2258,8 @@ class wpdb {
* character set. {@see WP_Error} object if there was an error.
*/
protected function get_col_charset( $table, $column ) {
$table = strtolower( $table );
$column = strtolower( $column );
$tablekey = strtolower( $table );
$columnkey = strtolower( $column );
/**
* Filter the column charset value before the DB is checked.
@ -2283,7 +2283,7 @@ class wpdb {
return false;
}
if ( empty( $this->table_charset[ $table ] ) ) {
if ( empty( $this->table_charset[ $tablekey ] ) ) {
// This primes column information for us.
$table_charset = $this->get_table_charset( $table );
if ( is_wp_error( $table_charset ) ) {
@ -2292,21 +2292,21 @@ class wpdb {
}
// If still no column information, return the table charset.
if ( empty( $this->col_meta[ $table ] ) ) {
return $this->table_charset[ $table ];
if ( empty( $this->col_meta[ $tablekey ] ) ) {
return $this->table_charset[ $tablekey ];
}
// If this column doesn't exist, return the table charset.
if ( empty( $this->col_meta[ $table ][ $column ] ) ) {
return $this->table_charset[ $table ];
if ( empty( $this->col_meta[ $tablekey ][ $columnkey ] ) ) {
return $this->table_charset[ $tablekey ];
}
// Return false when it's not a string column.
if ( empty( $this->col_meta[ $table ][ $column ]->Collation ) ) {
if ( empty( $this->col_meta[ $tablekey ][ $columnkey ]->Collation ) ) {
return false;
}
list( $charset ) = explode( '_', $this->col_meta[ $table ][ $column ]->Collation );
list( $charset ) = explode( '_', $this->col_meta[ $tablekey ][ $columnkey ]->Collation );
return $charset;
}