Changeset 40979

Timestamp:

07/01/2017 11:45:09 AM (7 years ago)

Author:

boonebgorges

Message:

Taxonomy: Ignore cached term value when it doesn't match the queried taxonomy.

When a cache entry is found that matches the requested $term_id, but
doesn't match an explicitly provided $taxonomy, that cache entry
should be ignored.

Props GunGeekATX.
Fixes #40671.

Location:

trunk

Files:

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

trunk/src/wp-includes/class-wp-term.php

@@ -137 +137 @@
         // If there isn't a cached version, hit the database.
         if ( ! $_term || ( $taxonomy && $taxonomy !== $_term->taxonomy ) ) {
+            // Any term found in the cache is not a match, so don't use it.
+            $_term = false;
+
             // Grab all matching terms, in case any are shared between taxonomies.
             $terms = $wpdb->get_results( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id = %d", $term_id ) );

trunk/tests/phpunit/tests/term/wpTerm.php

@@ -69 +69 @@
         $this->assertSame( 1, $found->term_id );
     }
+
+    /**
+     * @ticket 40671
+     */
+    public function test_get_instance_should_respect_taxonomy_when_term_id_is_found_in_cache() {
+        global $wpdb;
+
+        register_taxonomy( 'wptests_tax2', 'post' );
+
+        // Ensure that cache is primed.
+        WP_Term::get_instance( self::$term_id, 'wptests_tax' );
+
+        $found = WP_Term::get_instance( self::$term_id, 'wptests_tax2' );
+        $this->assertFalse( $found );
+    }
 }