sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests 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



git-svn-id: https://develop.svn.wordpress.org/trunk@31371 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast 2015-02-09 00:33:32 +00:00
parent 2518bbbb1f
commit afdd7da11b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/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 );
}
}