WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WPDB: When we're removing invalid text text from strings with multiple different character sets, `wpdb::strip_invalid_text()` wasn't correctly switching connection character sets. 

Fixes #31262


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


git-svn-id: http://core.svn.wordpress.org/trunk@31352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-02-09 00:34:25 +00:00
parent 3aea5f144b
commit 55742904c0
2 changed files with 4 additions and 3 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.2-alpha-31370';
$wp_version = '4.2-alpha-31371';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

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

@ -2461,7 +2461,8 @@ class wpdb {
}
// Change the charset to match the string(s) we're converting
if ( $charset !== $this->charset ) {
if ( $charset !== $connection_charset ) {
$connection_charset = $charset;
$this->set_charset( $this->dbh, $charset );
}
@ -2482,7 +2483,7 @@ class wpdb {
// Don't forget to change the charset back!
if ( $connection_charset !== $this->charset ) {
$this->set_charset( $this->dbh, $connection_charset );
$this->set_charset( $this->dbh );
}
}