Changeset 6246

Timestamp:

10/13/2007 07:04:39 PM (18 years ago)

Author:

ryan

Message:

If checking for term within taxonomy, just do the taxonomy specific query. Saves one query.

File:

• trunk/wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-includes/taxonomy.php

@@ -643 +643 @@
     }
 
-    $term_id = $wpdb->get_var("SELECT term_id FROM $wpdb->terms as t WHERE $where");
-
-    if ( empty($taxonomy) || empty($term_id) )
-        return $term_id;
-
-    $taxonomy = $wpdb->escape( $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);
+    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_var("SELECT term_id FROM $wpdb->terms as t WHERE $where");
 }