Changeset 43314 for branches/4.9

Timestamp:

05/25/2018 01:25:55 AM (6 years ago)

Author:

boonebgorges

Message:

Taxonomy: Improve cache handling when querying for terms using all_with_object_id.

When a term query using fields=all_with_object_id hits the cache, the
cached stdClass objects must be converted to WP_Term objects. This
was overlooked when WP_Term_Query was refactored to support object
queries in [38667].

Merges [43313] to the 4.9 branch.

Props dlh.
Fixes #44221.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-term-query.php (modified) (1 diff)
• tests/phpunit/tests/term/query.php (modified) (1 diff)

branches/4.9/src/wp-includes/class-wp-term-query.php

@@ -672 +672 @@
         $cache = wp_cache_get( $cache_key, 'terms' );
         if ( false !== $cache ) {
-            if ( 'all' === $_fields ) {
+            if ( 'all' === $_fields || 'all_with_object_id' === $_fields ) {
                 $cache = array_map( 'get_term', $cache );
             }

branches/4.9/tests/phpunit/tests/term/query.php

@@ -288 +288 @@
         foreach ( $query->terms as $term ) {
             $this->assertSame( $t, $term->term_id );
+        }
+    }
+
+    /**
+     * @ticket 44221
+     */
+    public function test_all_with_object_id_should_return_term_objects() {
+        register_taxonomy( 'wptests_tax_1', 'post' );
+        $posts = self::factory()->post->create_many( 2 );
+        $t     = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax_1' ) );
+
+        foreach ( $posts as $p ) {
+            wp_set_object_terms( $p, array( $t ), 'wptests_tax_1' );
+        }
+
+        $query = new WP_Term_Query();
+        $args = array(
+            'taxonomy'   => 'wptests_tax_1',
+            'object_ids' => $posts,
+            'fields'     => 'all_with_object_id',
+        );
+
+        $terms = $query->query( $args );
+        $this->assertNotEmpty( $terms );
+        foreach ( $terms as $term ) {
+            $this->assertInstanceOf( 'WP_Term', $term );
+            $this->assertObjectHasAttribute( 'object_id', $term );
+        }
+
+        // Run again to check the cached response.
+        $terms = $query->query( $args );
+        $this->assertNotEmpty( $terms );
+        foreach ( $terms as $term ) {
+            $this->assertInstanceOf( 'WP_Term', $term );
+            $this->assertObjectHasAttribute( 'object_id', $term );
         }
     }