Changeset 27142

Timestamp:

02/09/2014 05:41:07 PM (13 years ago)

Author:

wonderboymusic

Message:

Reuse the terms cache group for taxonomy cache invalidation.

See #22526, #14485, [27101], [27102].

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (4 diffs)
• tests/phpunit/tests/term/cache.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -3517 +3517 @@
  */
 function get_taxonomy_last_changed( $taxonomy ) {
-        $last_changed = wp_cache_get( 'last_changed', $taxonomy );
+        $key = $taxonomy . '_last_changed';
+        $last_changed = wp_cache_get( $key, 'terms' );
         if ( ! $last_changed ) {
                 $last_changed = microtime();
-                wp_cache_set( 'last_changed', $last_changed, $taxonomy );
+                wp_cache_set( $key, $last_changed, 'terms' );
         }
         return $last_changed;
@@ -3534 +3535 @@
  */
 function set_taxonomy_last_changed( $taxonomy ) {
-        wp_cache_delete( 'last_changed', $taxonomy );
+        wp_cache_delete( $taxonomy . '_last_changed', 'terms' );
         return get_taxonomy_last_changed( $taxonomy );
 }
@@ -3554 +3555 @@
 function post_taxonomy_is_fresh( $id, $taxonomy ) {
         $last_changed = get_taxonomy_last_changed( $taxonomy );
-        $post_last_changed = wp_cache_get( $id, $taxonomy . '_last_changed' );
+        $key = $id . '_' . $taxonomy . '_last_changed';
+        $post_last_changed = wp_cache_get( $key, 'terms' );
         if ( ! $post_last_changed || $last_changed !== $post_last_changed ) {
-                wp_cache_set( $id, $last_changed, $taxonomy . '_last_changed' );
+                wp_cache_set( $key, $last_changed, 'terms' );
                 return false;
         }
@@ -3578 +3580 @@
 function taxonomy_hierarchy_is_fresh( $taxonomy ) {
         $last_changed = get_taxonomy_last_changed( $taxonomy );
-        $hierarchy_last_changed = wp_cache_get( 'hierarchy_last_changed', $taxonomy );
+        $key = $taxonomy . '_hierarchy_last_changed';
+        $hierarchy_last_changed = wp_cache_get( $key, 'terms' );
         if ( ! $hierarchy_last_changed || $last_changed !== $hierarchy_last_changed ) {
-                wp_cache_set( 'hierarchy_last_changed', $last_changed, $taxonomy );
+                wp_cache_set( $key, $last_changed, 'terms' );
                 return false;
         }

trunk/tests/phpunit/tests/term/cache.php

@@ -35 +35 @@
         function test_get_taxonomy_last_changed() {
                 $last_changed = get_taxonomy_last_changed( 'category' );
-                $last_changed_cache = wp_cache_get( 'last_changed', 'category' );
+                $key = 'category_last_changed';
+                $last_changed_cache = wp_cache_get( $key, 'terms' );
                 $this->assertEquals( $last_changed, $last_changed_cache );
-                wp_cache_delete( 'last_changed', 'category' );
+                wp_cache_delete( $key, 'terms' );
                 $this->assertEquals( $last_changed, $last_changed_cache );
                 $last_changed = get_taxonomy_last_changed( 'category' );