Changeset 31287

Timestamp:

01/28/2015 08:42:25 PM (10 years ago)

Author:

boonebgorges

Message:

Don't use term IDs for array indexes when caching object terms.

Uncached results pulled from wp_get_object_terms() are zero-indexed (ie 0,
1, 2...). As a result, get_the_terms() was returning a strictly different
array when pulling from the cache and when the cache was empty.

Props joshlevinson.
Fixes #31086.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -3784 +3784 @@
     $object_terms = array();
     foreach ( (array) $terms as $term )
-        $object_terms[$term->object_id][$term->taxonomy][$term->term_id] = $term;
+        $object_terms[$term->object_id][$term->taxonomy][] = $term;
 
     foreach ( $ids as $id ) {

trunk/tests/phpunit/tests/term.php

@@ -1586 +1586 @@
 
     /**
+     * @ticket 31086
+     */
+    public function test_get_the_terms_should_return_zero_indexed_array_when_cache_is_empty() {
+        register_taxonomy( 'wptests_tax', 'post' );
+        $p = $this->factory->post->create();
+        wp_set_object_terms( $p, array( 'foo', 'bar' ), 'wptests_tax' );
+
+        $found = get_the_terms( $p, 'wptests_tax' );
+
+        $this->assertEqualSets( array( 0, 1 ), array_keys( $found ) );
+    }
+
+    /**
+     * @ticket 31086
+     */
+    public function test_get_the_terms_should_return_zero_indexed_array_when_cache_is_primed() {
+        register_taxonomy( 'wptests_tax', 'post' );
+        $p = $this->factory->post->create();
+        wp_set_object_terms( $p, array( 'foo', 'bar' ), 'wptests_tax' );
+
+        // Prime cache.
+        update_object_term_cache( array( $p ), array( 'post' ) );
+
+        $found = get_the_terms( $p, 'wptests_tax' );
+
+        $this->assertEqualSets( array( 0, 1 ), array_keys( $found ) );
+    }
+
+    /**
      * @ticket 19205
      */