Changeset 8433
- Timestamp:
- 07/24/2008 07:28:40 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/schema.php
r8202 r8433 20 20 term_group bigint(10) NOT NULL default 0, 21 21 PRIMARY KEY (term_id), 22 UNIQUE KEY slug (slug) 22 UNIQUE KEY slug (slug), 23 KEY name (name) 23 24 ) $charset_collate; 24 25 CREATE TABLE $wpdb->term_taxonomy ( -
trunk/wp-includes/taxonomy.php
r8393 r8433 762 762 global $wpdb; 763 763 764 $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; 765 $tax_select = "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 "; 766 764 767 if ( is_int($term) ) { 765 768 if ( 0 == $term ) 766 769 return 0; 767 770 $where = 't.term_id = %d'; 768 } else { 769 if ( '' === $term = sanitize_title($term) ) 770 return 0; 771 $where = 't.slug = %s'; 772 } 773 774 if ( !empty($taxonomy) ) 775 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", $term, $taxonomy), ARRAY_A); 776 777 return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $term) ); 771 if ( !empty($taxonomy) ) 772 return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A ); 773 else 774 return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) ); 775 } 776 777 if ( '' === $slug = sanitize_title($term) ) 778 return 0; 779 780 $where = 't.slug = %s'; 781 $else_where = 't.name = %s'; 782 783 if ( !empty($taxonomy) ) { 784 if ( $result = $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", $slug, $taxonomy), ARRAY_A) ) 785 return $result; 786 787 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 $else_where AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); 788 } 789 790 if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $slug) ) ) 791 return $result; 792 793 return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where", $term) ); 778 794 } 779 795 -
trunk/wp-includes/version.php
r8377 r8433 16 16 * @global int $wp_db_version 17 17 */ 18 $wp_db_version = 8 202;18 $wp_db_version = 8370; 19 19 20 20 ?>
Note: See TracChangeset
for help on using the changeset viewer.