Changeset 8377

Show
Ignore:
Timestamp:
07/19/08 19:00:56 (4 months ago)
Author:
ryan
Message:

Revert accidental bits that snuck in with [8376]. see #7227

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/taxonomy.php

    r8376 r8377  
    762762    global $wpdb; 
    763763 
    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  
    767764    if ( is_int($term) ) { 
    768765        if ( 0 == $term ) 
    769766            return 0; 
    770767        $where = 't.term_id = %d'; 
    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) ); 
     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) ); 
    794778} 
    795779 

  • trunk/wp-includes/version.php

    r8376 r8377  
    1616 * @global int $wp_db_version 
    1717 */ 
    18 $wp_db_version = 8370; 
     18$wp_db_version = 8202; 
    1919 
    2020?>