Changeset 12881 for trunk/wp-includes/taxonomy.php

Timestamp:

01/27/2010 07:42:23 PM (15 years ago)

Author:

ryan

Message:

Change back to an option so that it is always there and regenerate it after cleaning the cache instead of waiting for the next page load. Don't clean taxonomy wide caches when just updating object counts to avoid cleaning when updating a post.

File:

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

trunk/wp-includes/taxonomy.php

@@ -1868 +1868 @@
     }
 
-    clean_term_cache($terms);
+    clean_term_cache($terms, '', false);
 
     return true;
@@ -1918 +1918 @@
  * @param int|array $ids Single or list of Term IDs
  * @param string $taxonomy Can be empty and will assume tt_ids, else will use for context.
- */
-function clean_term_cache($ids, $taxonomy = '') {
+ * @param bool $clean_taxonomy Whether to clean taxonomy wide caches (true), or just individual term object caches (false). Default is true.
+ */
+function clean_term_cache($ids, $taxonomy = '', $clean_taxonomy = true) {
     global $wpdb;
     static $cleaned = array();
@@ -1952 +1953 @@
             continue;
         $cleaned[$taxonomy] = true;
-        wp_cache_delete('all_ids', $taxonomy);
-        wp_cache_delete('get', $taxonomy);
-        delete_transient("{$taxonomy}_children");
+
+        if ( $clean_taxonomy ) {
+            wp_cache_delete('all_ids', $taxonomy);
+            wp_cache_delete('get', $taxonomy);
+            delete_option("{$taxonomy}_children");
+            // Regenerate {$taxonomy}_children
+            _get_term_hierarchy($taxonomy);
+        }
+
         do_action('clean_term_cache', $ids, $taxonomy);
     }
@@ -2093 +2100 @@
     if ( !is_taxonomy_hierarchical($taxonomy) )
         return array();
-    $children = get_transient("{$taxonomy}_children");
+    $children = get_option("{$taxonomy}_children");
+
     if ( is_array($children) )
         return $children;
-
     $children = array();
     $terms = get_terms($taxonomy, array('get' => 'all', 'orderby' => 'id', 'fields' => 'id=>parent'));
@@ -2103 +2110 @@
             $children[$parent][] = $term_id;
     }
-    set_transient("{$taxonomy}_children", $children);
+    update_option("{$taxonomy}_children", $children);
 
     return $children;