Ticket #21760: 21760.6.diff

src/wp-includes/functions.php

@@ -3502 +3502 @@
  * Determine if the scheme of the given URL is https.
  *
  * @since 4.0.0
- * 
+ *
  * @param  string  $url The URL
  * @return boolean      True if the given URL uses https, false if not (or if the URL is not valid).
  */
@@ -4597 +4597 @@
 
         return (bool) $var;
 }
+
+/**
+ *
+ * @param string $bucket
+ * @return int
+ */
+function wp_get_last_changed( $bucket ) {
+        $last_changed = wp_cache_get( 'last_changed', $bucket );
+        if ( ! $last_changed ) {
+                $last_changed = microtime();
+                wp_cache_set( 'last_changed', $last_changed, $bucket );
+        }
+        return $last_changed;
+}
+ No newline at end of file

src/wp-includes/taxonomy.php

@@ -962 +962 @@
                 return $error;
         }
 
+        $bucket = $taxonomy . ':' . wp_get_last_changed( 'terms' );
         if ( is_object($term) && empty($term->filter) ) {
-                wp_cache_add($term->term_id, $term, $taxonomy);
+                wp_cache_add( $term->term_id, $term, $taxonomy );
+                wp_cache_add( "slug:{$term->slug}", $term->term_id, $bucket );
                 $_term = $term;
         } else {
                 if ( is_object($term) )
@@ -974 +976 @@
                         $_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy = %s AND t.term_id = %d LIMIT 1", $taxonomy, $term) );
                         if ( ! $_term )
                                 return null;
-                        wp_cache_add($term, $_term, $taxonomy);
+                        wp_cache_add( $term, $_term, $taxonomy );
+                        wp_cache_add( "slug:{$_term->slug}", $term, $bucket );
                 }
         }
 
@@ -1046 +1049 @@
         if ( ! taxonomy_exists($taxonomy) )
                 return false;
 
+        $cache = false;
         if ( 'slug' == $field ) {
                 $field = 't.slug';
                 $value = sanitize_title($value);
                 if ( empty($value) )
                         return false;
+                $bucket = $taxonomy . ':' . wp_get_last_changed( 'terms' );
+                $term_id = wp_cache_get( "slug:{$value}", $bucket );
+                if ( $term_id ) {
+                        $value = $term_id;
+                        $cache = true;
+                }
         } else if ( 'name' == $field ) {
                 // Assume already escaped
                 $value = wp_unslash($value);
@@ -1059 +1069 @@
                 $value = (int) $value;
                 $field = 'tt.term_taxonomy_id';
         } else {
+                $cache = true;
+        }
+
+        if ( $cache ) {
                 $term = get_term( (int) $value, $taxonomy, $output, $filter);
                 if ( is_wp_error( $term ) )
                         $term = false;
@@ -1069 +1083 @@
         if ( !$term )
                 return false;
 
-        wp_cache_add($term->term_id, $term, $taxonomy);
+        wp_cache_add( $term->term_id, $term, $taxonomy );
+        $bucket = $taxonomy . ':' . wp_get_last_changed( 'terms' );
+        wp_cache_add( "slug:{$term->slug}", $term->term_id, $bucket );
 
         /** This filter is documented in wp-includes/taxonomy.php */
         $term = apply_filters( 'get_term', $term, $taxonomy );
@@ -3407 +3423 @@
                 if ( empty($term_taxonomy) )
                         $term_taxonomy = $term->taxonomy;
 
-                wp_cache_add($term->term_id, $term, $term_taxonomy);
+                wp_cache_add( $term->term_id, $term, $term_taxonomy );
+                $bucket = $term_taxonomy . ':' . wp_get_last_changed( 'terms' );
+                wp_cache_add( "slug:{$term->slug}", $term->term_id, $bucket );
         }
 }
 

tests/phpunit/tests/term/cache.php

@@ -93 +93 @@
 
                 _unregister_taxonomy( $tax );
         }
+
+        /**
+         * @ticket 21760
+         */
+        function test_get_term_by_slug_cache() {
+                global $wpdb;
+                $term_id = $this->factory->term->create( array( 'slug' => 'burrito', 'taxonomy' => 'post_tag' ) );
+
+                $queries = $wpdb->num_queries;
+                get_term_by( 'slug', 'burrito', 'post_tag' );
+                $initial = $queries + 1;
+                $this->assertEquals( $initial, $wpdb->num_queries );
+                $term = get_term_by( 'slug', 'burrito', 'post_tag' );
+                $this->assertEquals( $initial, $wpdb->num_queries );
+
+                $this->assertEquals( get_term( $term_id, 'post_tag' ), $term );
+                $this->assertEquals( $initial, $wpdb->num_queries );
+        }
+        
+        /**
+         * @ticket 21760
+         */
+        function test_get_term_by_slug_cache_update() {
+                global $wpdb;
+                $term_id = $this->factory->term->create( array( 'slug' => 'burrito', 'taxonomy' => 'post_tag' ) );
+
+                $queries = $wpdb->num_queries;
+                get_term_by( 'slug', 'burrito', 'post_tag' );
+                $initial = $queries + 1;
+                $this->assertEquals( $initial, $wpdb->num_queries );
+                $term = get_term_by( 'slug', 'burrito', 'post_tag' );
+                $this->assertEquals( $initial, $wpdb->num_queries );
+
+                wp_update_term( $term_id, 'post_tag', array( 'name' => 'Taco' ) );
+                $this->assertNotEquals( $term, get_term( $term_id, 'post_tag' ) );
+                $after_queries = $wpdb->num_queries;
+                get_term_by( 'slug', 'burrito', 'post_tag' );
+                $this->assertEquals( $after_queries, $wpdb->num_queries );
+        }
 }
+ No newline at end of file