Changeset 31051

Timestamp:

01/05/2015 04:39:26 AM (12 years ago)

Author:

pento

Message:

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.

File:

• trunk/src/wp-includes/wp-db.php (modified) (5 diffs)

trunk/src/wp-includes/wp-db.php

@@ -2018 +2018 @@
 
                 if ( $query ) {
-                        $this->check_current_query = false;
                         $this->query( $query );
                 }
@@ -2047 +2046 @@
                 $this->func_call = "\$db->get_row(\"$query\",$output,$y)";
                 if ( $query ) {
-                        $this->check_current_query = false;
                         $this->query( $query );
                 } else {
@@ -2085 +2083 @@
         public function get_col( $query = null , $x = 0 ) {
                 if ( $query ) {
-                        $this->check_current_query = false;
                         $this->query( $query );
                 }
@@ -2114 +2111 @@
 
                 if ( $query ) {
-                        $this->check_current_query = false;
                         $this->query( $query );
                 } else {
@@ -2440 +2436 @@
                                 }
 
+                                $this->check_current_query = false;
+
                                 $row = $this->get_row( "SELECT " . implode( ', ', $query ), ARRAY_N );
                                 if ( ! $row ) {