From afdd7da11bfdd26f7dcab71f709ec2d964909e72 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Mon, 9 Feb 2015 00:33:32 +0000 Subject: [PATCH] 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 --- src/wp-includes/wp-db.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php index 6f60e9c31a..f31e5caa67 100644 --- a/src/wp-includes/wp-db.php +++ b/src/wp-includes/wp-db.php @@ -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 ); } }