Changeset 7645 for trunk/wp-includes/taxonomy.php

Timestamp:

04/14/2008 04:13:25 PM (18 years ago)

Author:

ryan

Message:

Prepare DB queries in more places. Props filosofo. see #6644

File:

• trunk/wp-includes/taxonomy.php (modified) (4 diffs)

trunk/wp-includes/taxonomy.php

@@ -750 +750 @@
 
     if ( !empty($taxonomy) )
-        return $wpdb->get_row("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = '$taxonomy'", ARRAY_A);
+        return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $taxonomy), ARRAY_A);
 
     return $wpdb->get_var("SELECT term_id FROM $wpdb->terms as t WHERE $where");
@@ -889 +889 @@
         $where = 'AND count > 0';
 
-    $taxonomy = $wpdb->escape( $taxonomy );
-    return $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE taxonomy = '$taxonomy' $where");
+    return $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE taxonomy = %s $where", $taxonomy) );
 }
 
@@ -919 +918 @@
         $terms = wp_get_object_terms($object_id, $taxonomy, 'fields=tt_ids');
         $in_terms = "'" . implode("', '", $terms) . "'";
-        $wpdb->query("DELETE FROM $wpdb->term_relationships WHERE object_id = '$object_id' AND term_taxonomy_id IN ($in_terms)");
+        $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_terms)", $object_id) );
         wp_update_term_count($terms, $taxonomy);
     }
@@ -1294 +1293 @@
         if ( $delete_terms ) {
             $in_delete_terms = "'" . implode("', '", $delete_terms) . "'";
-            $wpdb->query("DELETE FROM $wpdb->term_relationships WHERE object_id = '$object_id' AND term_taxonomy_id IN ($in_delete_terms)");
+            $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_delete_terms)", $object_id) );
             wp_update_term_count($delete_terms, $taxonomy);
         }