Changeset 24714

Timestamp:

07/16/2013 02:21:05 PM (11 years ago)

Author:

nacin

Message:

Use sanitize_key() instead of esc_sql() when 'escaping' variable DB field names. see #21767.

Location:

trunk/wp-includes

Files:

• meta.php (modified) (7 diffs)
• taxonomy.php (modified) (1 diff)
• user.php (modified) (1 diff)

trunk/wp-includes/meta.php

@@ -41 +41 @@
     global $wpdb;
 
-    $column = esc_sql($meta_type . '_id');
+    $column = sanitize_key($meta_type . '_id');
 
     // expected_slashed ($meta_key)
@@ -111 +111 @@
     global $wpdb;
 
-    $column = esc_sql($meta_type . '_id');
+    $column = sanitize_key($meta_type . '_id');
     $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 
@@ -194 +194 @@
     global $wpdb;
 
-    $type_column = esc_sql($meta_type . '_id');
+    $type_column = sanitize_key($meta_type . '_id');
     $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
     // expected_slashed ($meta_key)
@@ -398 +398 @@
         return false;
 
-    $column = esc_sql($meta_type . '_id');
+    $column = sanitize_key($meta_type . '_id');
     $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 
@@ -479 +479 @@
 
     // object and id columns
-    $column = esc_sql($meta_type . '_id');
+    $column = sanitize_key($meta_type . '_id');
     $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 
@@ -529 +529 @@
         return false;
 
-    $column = esc_sql($meta_type . '_id');
+    $column = sanitize_key($meta_type . '_id');
 
     global $wpdb;
@@ -707 +707 @@
             return false;
 
-        $meta_id_column = esc_sql( $type . '_id' );
+        $meta_id_column = sanitize_key( $type . '_id' );
 
         $join = array();

trunk/wp-includes/taxonomy.php

@@ -792 +792 @@
             return;
 
-        $resulting_field = esc_sql( $resulting_field );
+        $resulting_field = sanitize_key( $resulting_field );
 
         switch ( $query['field'] ) {

trunk/wp-includes/user.php

@@ -394 +394 @@
             $this->query_fields = array();
             foreach ( $qv['fields'] as $field )
-                $this->query_fields[] = $wpdb->users . '.' . esc_sql( $field );
+                $this->query_fields[] = $wpdb->users . '.' . sanitize_key( $field );
             $this->query_fields = implode( ',', $this->query_fields );
         } elseif ( 'all' == $qv['fields'] ) {