Changeset 5983

Timestamp:

08/30/2007 12:34:55 AM (19 years ago)

Author:

ryan

Message:

Make sure term cache is cleared when updating term counts.

File:

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

trunk/wp-includes/taxonomy.php

@@ -641 +641 @@
                 wp_update_term_count($terms, $taxonomy);
         }
-
-        // TODO clear the cache
 }
 
@@ -871 +869 @@
         }
 
-        // TODO clean old_terms. Need term_id instead of tt_id
-        clean_term_cache($term_ids, $taxonomy);
-
         return $tt_ids;
 }
@@ -950 +945 @@
 
         $taxonomy = get_taxonomy($taxonomy);
-        if ( !empty($taxonomy->update_count_callback) )
-                return call_user_func($taxonomy->update_count_callback, $terms);
-
-        // Default count updater
-        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'");
-        }
+        if ( !empty($taxonomy->update_count_callback) ) {
+                call_user_func($taxonomy->update_count_callback, $terms);
+        } else {
+                // Default count updater
+                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'");
+                }
+
+        }
+
+        clean_term_cache($terms);
 
         return true;
@@ -982 +981 @@
 }
 
-function clean_term_cache($ids, $taxonomy) {
+function clean_term_cache($ids, $taxonomy = '') {
+        global $wpdb;
+
         if ( !is_array($ids) )
                 $ids = array($ids);
 
-        foreach ( $ids as $id ) {
-                wp_cache_delete($id, $taxonomy);
-        }
-
-        wp_cache_delete('all_ids', $taxonomy);
-        wp_cache_delete('get', $taxonomy);
-        delete_option("{$taxonomy}_children");
+        $taxonomies = array();
+        // If no taxonomy, assume tt_ids.
+        if ( empty($taxonomy) ) {
+                $tt_ids = implode(', ', $ids);
+                $terms = $wpdb->get_results("SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id IN ($tt_ids)");
+                foreach ( (array) $terms as $term ) {
+                        $taxonomies[] = $term->taxonomy;
+                        wp_cache_delete($term->term_id, $term->taxonomy);
+                }
+                $taxonomies = array_unique($taxonomies);
+        } else {
+                foreach ( $ids as $id ) {
+                        wp_cache_delete($id, $taxonomy);
+                }
+                $taxonomies = array($taxonomy);
+        }
+
+        foreach ( $taxonomies as $taxonomy ) { 
+                wp_cache_delete('all_ids', $taxonomy);
+                wp_cache_delete('get', $taxonomy);
+                delete_option("{$taxonomy}_children");
+        }
+
         wp_cache_delete('get_terms', 'terms');
 }