Changeset 5558

Timestamp:

05/27/2007 06:17:50 AM (17 years ago)

Author:

ryan

Message:

Change term count callback style. see #4189

File:

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

trunk/wp-includes/taxonomy.php

@@ -2 +2 @@
 
 $wp_taxonomies =
-array('category' => array('object_type' => 'post', 'hierarchical' => true),
-'post_tag' => array('object_type' => 'post', 'hierarchical' => false),
+array('category' => array('object_type' => 'post', 'hierarchical' => true, 'update_count_callback' => '_update_post_term_count'),
+'post_tag' => array('object_type' => 'post', 'hierarchical' => false, 'update_count_callback' => '_update_post_term_count'),
 'link_category' => array('object_type' => 'link', 'hierarchical' => false));
 
@@ -112 +112 @@
         $taxonomies = array($taxonomies);
 
-    $terms = get_object_terms($object_id, $taxonomies, '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)");
-
-    // Assume all taxonomies have the same object type
-    $taxonomy = get_taxonomy($taxonomies[0]);
-    wp_update_term_count($terms, $taxonomy['object_type']);
+    foreach ( $taxonomies as $taxonomy ) {
+        $terms = 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)");
+
+        wp_update_term_count($terms, $taxonomy);
+    }
     
     // TODO clear the cache
@@ -238 +238 @@
 }
 
-function wp_update_term_count( $terms, $object_type ) {
+function wp_update_term_count( $terms, $taxonomy ) {
     if ( empty($terms) )
         return false;
 
-    // TODO validate object_type
-    
     if ( !is_array($terms) )
         $terms = array($terms);
@@ -249 +247 @@
     $terms = array_map('intval', $terms);
 
-    do_action("count_${object_type}_terms", $terms);
+    $taxonomy = get_taxonomy($taxonomy);
+    if ( isset($taxonomy['update_count_callback']) )
+        return call_user_func($taxonomy['update_count_callback'], $terms);
+
+    // Default count updater
+    $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = '$term'");
+    $wpdb->query("UPDATE $wpdb->term_taxonomy SET count = '$count' WHERE term_taxonomy_id = '$term'");
 
     return true;
@@ -310 +314 @@
         $terms = array($terms);
 
-    if ( ! $append ) {
-        $old_terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = '$taxonomy' AND tr.object_id = '$object_id'");
-        if ( empty($old_terms) )
-            $old_terms = array();
-    }
+    if ( ! $append )
+        $old_terms =  get_object_terms($object_id, $taxonomy, 'fields=tt_ids');
 
     $tt_ids = array();
@@ -330 +331 @@
     }
 
-    $taxonomy_data = get_taxonomy($taxonomy);
-    wp_update_term_count($tt_ids, $taxonomy_data['object_type']);
+    wp_update_term_count($tt_ids, $taxonomy);
 
     if ( ! $append ) {
@@ -339 +339 @@
             $wpdb->query("DELETE FROM $wpdb->term_relationships WHERE term_taxonomy_id IN ($delete_terms)");
             $wpdb->query("UPDATE $wpdb->term_taxonomy SET count = count - 1 WHERE term_taxonomy_id IN ($delete_terms)");
-            wp_update_term_count($delete_terms, $taxonomy_data['object_type']);
-        }
-    }
-
+            wp_update_term_count($delete_terms, $taxonomy);
+        }
+    }
+
+    // TODO clean old_terms. Need term_id instead of tt_id
     clean_term_cache($term_ids, $taxonomy);
 
@@ -683 +684 @@
     }
 }
-add_action('count_post_terms', '_update_post_term_count');
-
-function _update_link_term_count( $terms ) {
-    global $wpdb;
-
-    foreach ( $terms as $term ) {
-        $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = '$term'");
-        $wpdb->query("UPDATE $wpdb->term_taxonomy SET count = '$count' WHERE term_taxonomy_id = '$term'");
-    }
-}
-add_action('count_link_terms', '_update_link_term_count');
 
 ?>