Ticket #21760: 21760.5.diff

src/wp-includes/taxonomy.php

@@ -963 +963 @@
         }
 
         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, $taxonomy );
                 $_term = $term;
         } else {
                 if ( is_object($term) )
@@ -974 +975 @@
                         $_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, $taxonomy );
                 }
         }
 
@@ -1046 +1048 @@
         if ( ! taxonomy_exists($taxonomy) )
                 return false;
 
+        $cache = false;
         if ( 'slug' == $field ) {
                 $field = 't.slug';
                 $value = sanitize_title($value);
                 if ( empty($value) )
                         return false;
+                $term_id = wp_cache_get( "slug:{$value}", $taxonomy );
+                if ( $term_id ) {
+                        $value = $term_id;
+                        $cache = true;
+                }
         } else if ( 'name' == $field ) {
                 // Assume already escaped
                 $value = wp_unslash($value);
@@ -1059 +1067 @@
                 $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 +1081 @@
         if ( !$term )
                 return false;
 
-        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, $taxonomy );
 
         /** This filter is documented in wp-includes/taxonomy.php */
         $term = apply_filters( 'get_term', $term, $taxonomy );
@@ -3270 +3283 @@
         if ( empty($taxonomy) ) {
                 $tt_ids = array_map('intval', $ids);
                 $tt_ids = implode(', ', $tt_ids);
-                $terms = $wpdb->get_results("SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id IN ($tt_ids)");
+                $terms = $wpdb->get_results( "SELECT t.slug, tt.term_id, tt.taxonomy FROM $wpdb->terms t INNER JOIN $wpdb->term_taxonomy tt WHERE tt.term_taxonomy_id IN ($tt_ids)" );
                 $ids = array();
                 foreach ( (array) $terms as $term ) {
                         $taxonomies[] = $term->taxonomy;
                         $ids[] = $term->term_id;
-                        wp_cache_delete($term->term_id, $term->taxonomy);
+                        wp_cache_delete( $term->term_id, $term->taxonomy );
+                        wp_cache_delete( "slug:{$term->slug}", $term->taxonomy );
                 }
                 $taxonomies = array_unique($taxonomies);
         } else {
@@ -3282 +3296 @@
                 $taxonomies = array($taxonomy);
                 foreach ( $taxonomies as $taxonomy ) {
                         foreach ( $ids as $id ) {
-                                wp_cache_delete($id, $taxonomy);
+                                wp_cache_delete( $id, $taxonomy );
                         }
+
+                        $term_ids = implode( ', ', array_map( 'intval', $ids ) );
+                        $slugs = $wpdb->get_col( "SELECT t.slug FROM $wpdb->terms t INNER JOIN $wpdb->term_taxonomy tt ON t.term_id = tt.term_id WHERE tt.term_id IN ($term_ids)" );
+                        foreach ( $slugs as $slug ) {
+                                wp_cache_delete( "slug:{$slug}", $taxonomy );
+                        }
                 }
         }
 
@@ -3407 +3427 @@
                 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 );
+                wp_cache_add( "slug:{$term->slug}", $term->term_id, $term_taxonomy );
         }
 }
 

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