From aada083f3c3f7b74f236a52704e065f7f33f380c Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Mon, 5 Jan 2015 04:39:26 +0000
Subject: [PATCH] WPDB: To ensure we're not asking MySQL to read data using
 queries that it can't handle, make sure that we run all read queries through
 the character set sanity checks.

See #21212.



git-svn-id: https://develop.svn.wordpress.org/trunk@31051 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/wp-db.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php
index 47f563201e..5178317bfa 100644
--- a/src/wp-includes/wp-db.php
+++ b/src/wp-includes/wp-db.php
@@ -2017,7 +2017,6 @@ class wpdb {
 		$this->func_call = "\$db->get_var(\"$query\", $x, $y)";
 
 		if ( $query ) {
-			$this->check_current_query = false;
 			$this->query( $query );
 		}
 
@@ -2046,7 +2045,6 @@ class wpdb {
 	public function get_row( $query = null, $output = OBJECT, $y = 0 ) {
 		$this->func_call = "\$db->get_row(\"$query\",$output,$y)";
 		if ( $query ) {
-			$this->check_current_query = false;
 			$this->query( $query );
 		} else {
 			return null;
@@ -2084,7 +2082,6 @@ class wpdb {
 	 */
 	public function get_col( $query = null , $x = 0 ) {
 		if ( $query ) {
-			$this->check_current_query = false;
 			$this->query( $query );
 		}
 
@@ -2113,7 +2110,6 @@ class wpdb {
 		$this->func_call = "\$db->get_results(\"$query\", $output)";
 
 		if ( $query ) {
-			$this->check_current_query = false;
 			$this->query( $query );
 		} else {
 			return null;
@@ -2439,6 +2435,8 @@ class wpdb {
 					$this->set_charset( $this->dbh, $charset );
 				}
 
+				$this->check_current_query = false;
+
 				$row = $this->get_row( "SELECT " . implode( ', ', $query ), ARRAY_N );
 				if ( ! $row ) {
 					$this->set_charset( $this->dbh, $connection_charset );