Changeset 36358

Timestamp:

01/20/2016 05:34:30 AM (9 years ago)

Author:

dd32

Message:

Taxonomy: Populate term cache with proper clone of term objects.

[34999] modified the cache strategy for terms in the context of
wp_get_object_terms(). As part of these changes, the object_id property of
term objects had to be unset before being cached. To avoid modifying passed-by-
reference terms, update_term_cache() attempted to make a copy of the terms
passed to the function; however, it failed to use the clone keyword, and thus
only created a reference instead of a copy.

Merges [36323] to the 4.4 branch.
Props berengerzyla.
Fixes #35462.

Location:

branches/4.4

Files:

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

branches/4.4/src/wp-includes/taxonomy.php

@@ -3647 +3647 @@
     foreach ( (array) $terms as $term ) {
         // Create a copy in case the array was passed by reference.
-        $_term = $term;
+        $_term = clone $term;
 
         // Object ID should not be cached.

branches/4.4/tests/phpunit/tests/term/cache.php

@@ -201 +201 @@
         _unregister_taxonomy( 'wptests_tax' );
     }
+
+    /**
+     * @ticket 35462
+     */
+    public function test_term_objects_should_not_be_modified_by_update_term_cache() {
+        register_taxonomy( 'wptests_tax', 'post' );
+        $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+        $p = self::factory()->post->create();
+
+        wp_set_object_terms( $p, $t, 'wptests_tax' );
+
+        $terms = wp_get_object_terms( $p, 'wptests_tax', array( 'fields' => 'all_with_object_id' ) );
+
+        update_term_cache( $terms );
+
+        foreach ( $terms as $term ) {
+            $this->assertSame( $p, $term->object_id );
+        }
+    }
 }