Changeset 33480

Timestamp:

07/29/2015 06:48:09 AM (8 years ago)

Author:

pento

Message:

WPDB: When checking the encoding of strings against the database, make sure we're only relying on the return value of strings that were sent to the database. Also make sure that we're not trying to sanity check strings that've been marked as not needing sanity checking.

Merge of [33455] to the 4.1 branch.

See #32279.

File:

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

branches/4.1/src/wp-includes/wp-db.php

@@ -2063 +2063 @@
         $this->func_call = "\$db->get_var(\"$query\", $x, $y)";
 
-        if ( $this->check_safe_collation( $query ) ) {
+        if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
             $this->check_current_query = false;
         }
@@ -2096 +2096 @@
         $this->func_call = "\$db->get_row(\"$query\",$output,$y)";
 
-        if ( $this->check_safe_collation( $query ) ) {
+        if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
             $this->check_current_query = false;
         }
@@ -2137 +2137 @@
      */
     public function get_col( $query = null , $x = 0 ) {
-        if ( $this->check_safe_collation( $query ) ) {
+        if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
             $this->check_current_query = false;
         }
@@ -2169 +2169 @@
         $this->func_call = "\$db->get_results(\"$query\", $output)";
 
-        if ( $this->check_safe_collation( $query ) ) {
+        if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
             $this->check_current_query = false;
         }
@@ -2690 +2690 @@
 
             foreach ( array_keys( $data ) as $column ) {
-                $data[ $column ]['value'] = $row["x_$column"];
+                if ( isset( $row["x_$column"] ) ) {
+                    $data[ $column ]['value'] = $row["x_$column"];
+                }
             }
         }