Changeset 37567

Timestamp:

05/25/2016 06:44:00 PM (9 years ago)

Author:

boonebgorges

Message:

Fix termmeta pre-fetching in wp_get_object_terms().

[34529] introduced logic intended to prime the termmeta cache for certain
values of the fields parameter. There were a few bugs:

• The all_with_object_id param was misspelled.
• term_id was used instead of ids.
• The values being passed to update_termmeta_cache() in the case where fields=ids was not correct.

All of these would result in a failure to pre-fetch termmeta in some cases.

Props dlh.
Fixes #36932.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -2629 +2629 @@
 
     // Update termmeta cache, if necessary.
-    if ( $args['update_term_meta_cache'] && ( 'all' === $fields || 'all_with_object_ids' === $fields || 'term_id' === $fields ) ) {
-        if ( 'term_id' === $fields ) {
-            $term_ids = $fields;
+    if ( $args['update_term_meta_cache'] && ( 'all' === $fields || 'all_with_object_id' === $fields || 'ids' === $fields ) ) {
+        if ( 'ids' === $fields ) {
+            $term_ids = $terms;
         } else {
             $term_ids = wp_list_pluck( $terms, 'term_id' );

trunk/tests/phpunit/tests/term/wpGetObjectTerms.php

@@ -474 +474 @@
 
     /**
+     * @ticket 36932
+     */
+    public function test_termmeta_cache_should_be_primed_when_fields_is_all_with_object_id() {
+        global $wpdb;
+
+        register_taxonomy( 'wptests_tax', 'post' );
+        $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+        add_term_meta( $terms[0], 'foo', 'bar' );
+        add_term_meta( $terms[1], 'foo', 'bar' );
+        add_term_meta( $terms[2], 'foo', 'bar' );
+
+        $p = self::factory()->post->create();
+        wp_set_object_terms( $p, $terms, 'wptests_tax' );
+
+        $found = wp_get_object_terms( $p, 'wptests_tax', array(
+            'update_term_meta_cache' => true,
+            'fields' => 'all_with_object_id',
+        ) );
+
+        $num_queries = $wpdb->num_queries;
+
+        foreach ( $terms as $t ) {
+            $this->assertSame( 'bar', get_term_meta( $t, 'foo', true ) );
+        }
+
+        $this->assertSame( $num_queries, $wpdb->num_queries );
+    }
+
+    /**
+     * @ticket 36932
+     */
+    public function test_termmeta_cache_should_be_primed_when_fields_is_ids() {
+        global $wpdb;
+
+        register_taxonomy( 'wptests_tax', 'post' );
+        $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+        add_term_meta( $terms[0], 'foo', 'bar' );
+        add_term_meta( $terms[1], 'foo', 'bar' );
+        add_term_meta( $terms[2], 'foo', 'bar' );
+
+        $p = self::factory()->post->create();
+        wp_set_object_terms( $p, $terms, 'wptests_tax' );
+
+        $found = wp_get_object_terms( $p, 'wptests_tax', array(
+            'update_term_meta_cache' => true,
+            'fields' => 'ids',
+        ) );
+
+        $num_queries = $wpdb->num_queries;
+
+        foreach ( $terms as $t ) {
+            $this->assertSame( 'bar', get_term_meta( $t, 'foo', true ) );
+        }
+
+        $this->assertSame( $num_queries, $wpdb->num_queries );
+    }
+
+    /**
      * @ticket 10142
      */