Changeset 35117

Timestamp:

10/13/2015 02:57:21 AM (11 years ago)

Author:

boonebgorges

Message:

In get_terms(), don't store WP_Term objects in cache.

Fixes #34282.

Location:

trunk

Files:

• src/wp-includes/taxonomy-functions.php (modified) (3 diffs)
• tests/phpunit/tests/term/getTerms.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy-functions.php

@@ -1156 +1156 @@
         $cache = wp_cache_get( $cache_key, 'terms' );
         if ( false !== $cache ) {
+                if ( 'all' === $args['fields'] ) {
+                        $cache = array_map( 'get_term', $cache );
+                }
 
                 /**
@@ -1495 +1498 @@
                         $_terms[ $term->term_id ] = $term->slug;
                 }
-        } else {
-                $_terms = array_map( 'get_term', $terms );
         }
 
@@ -1508 +1509 @@
 
         wp_cache_add( $cache_key, $terms, 'terms', DAY_IN_SECONDS );
+
+        if ( 'all' === $_fields ) {
+                $terms = array_map( 'get_term', $terms );
+        }
 
         /** This filter is documented in wp-includes/taxonomy */

trunk/tests/phpunit/tests/term/getTerms.php

@@ -1594 +1594 @@
         /**
          * @ticket 14162
+         * @ticket 34282
+         */
+        public function test_should_return_wp_term_objects_when_pulling_from_the_cache() {
+                global $wpdb;
+
+                register_taxonomy( 'wptests_tax', 'post' );
+                $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+
+                // Prime the cache.
+                get_terms( 'wptests_tax', array(
+                        'hide_empty' => false,
+                        'fields' => 'all',
+                ) );
+
+                $num_queries = $wpdb->num_queries;
+
+                $found = get_terms( 'wptests_tax', array(
+                        'hide_empty' => false,
+                        'fields' => 'all',
+                ) );
+
+                $this->assertSame( $num_queries, $wpdb->num_queries );
+
+                $this->assertNotEmpty( $found );
+
+                foreach ( $found as $term ) {
+                        $this->assertInstanceOf( 'WP_Term', $term );
+                }
+        }
+
+        /**
+         * @ticket 14162
          */
         public function test_should_prime_individual_term_cache_when_fields_is_all() {