Changeset 9349

Show
Ignore:
Timestamp:
10/25/08 22:56:02 (3 months ago)
Author:
westi
Message:

Better variable naming. See #7358.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/post.php

    r9259 r9349  
    15941594    // Update counts for the post's terms. 
    15951595    foreach ( (array) get_object_taxonomies('post') as $taxonomy ) { 
    1596         $terms = wp_get_object_terms($post_id, $taxonomy, 'fields=tt_ids'); 
    1597         wp_update_term_count($terms, $taxonomy); 
     1596        $tt_ids = wp_get_object_terms($post_id, $taxonomy, 'fields=tt_ids'); 
     1597        wp_update_term_count($tt_ids, $taxonomy); 
    15981598    } 
    15991599 

  • trunk/wp-includes/taxonomy.php

    r9229 r9349  
    971971 
    972972    foreach ( (array) $taxonomies as $taxonomy ) { 
    973         $terms = wp_get_object_terms($object_id, $taxonomy, 'fields=tt_ids'); 
    974         $in_terms = "'" . implode("', '", $terms) . "'"; 
    975         $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_terms)", $object_id) ); 
    976         wp_update_term_count($terms, $taxonomy); 
     973        $tt_ids = wp_get_object_terms($object_id, $taxonomy, 'fields=tt_ids'); 
     974        $in_tt_ids = "'" . implode("', '", $tt_ids) . "'"; 
     975        $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id) ); 
     976        wp_update_term_count($tt_ids, $taxonomy); 
    977977    } 
    978978} 
    …… 
    13331333 
    13341334    if ( ! $append ) 
    1335         $old_terms =  wp_get_object_terms($object_id, $taxonomy, 'fields=tt_ids'); 
     1335        $old_tt_ids =  wp_get_object_terms($object_id, $taxonomy, 'fields=tt_ids'); 
    13361336 
    13371337    $tt_ids = array(); 
    …… 
    13421342            continue; 
    13431343 
    1344         if ( !$id = is_term($term, $taxonomy) ) 
    1345             $id = wp_insert_term($term, $taxonomy); 
    1346         if ( is_wp_error($id) ) 
    1347             return $id; 
    1348         $term_ids[] = $id['term_id']; 
    1349         $id = $id['term_taxonomy_id']; 
    1350         $tt_ids[] = $id; 
    1351  
    1352         if ( $wpdb->get_var( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $id ) ) ) 
     1344        if ( !$term_info = is_term($term, $taxonomy) ) 
     1345            $term_info = wp_insert_term($term, $taxonomy); 
     1346        if ( is_wp_error($term_info) ) 
     1347            return $term_info; 
     1348        $term_ids[] = $term_info['term_id']; 
     1349        $tt_id = $term_info['term_taxonomy_id']; 
     1350        $tt_ids[] = $tt_id; 
     1351 
     1352        if ( $wpdb->get_var( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $tt_id ) ) ) 
    13531353            continue; 
    1354         $wpdb->insert( $wpdb->term_relationships, array( 'object_id' => $object_id, 'term_taxonomy_id' => $id ) ); 
     1354        $wpdb->insert( $wpdb->term_relationships, array( 'object_id' => $object_id, 'term_taxonomy_id' => $tt_id ) ); 
    13551355    } 
    13561356 
    …… 
    13581358 
    13591359    if ( ! $append ) { 
    1360         $delete_terms = array_diff($old_terms, $tt_ids); 
     1360        $delete_terms = array_diff($old_tt_ids, $tt_ids); 
    13611361        if ( $delete_terms ) { 
    13621362            $in_delete_terms = "'" . implode("', '", $delete_terms) . "'";