From ed9d4b940816ec061bf2f200df263c02f5471f32 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Sat, 1 Jul 2017 11:46:41 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@40979


git-svn-id: http://core.svn.wordpress.org/trunk@40829 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-term.php | 3 +++
 wp-includes/version.php       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/wp-includes/class-wp-term.php b/wp-includes/class-wp-term.php
index acd0124172..76d74e060c 100644
--- a/wp-includes/class-wp-term.php
+++ b/wp-includes/class-wp-term.php
@@ -136,6 +136,9 @@ final class WP_Term {
 
 		// 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 ) );
 			if ( ! $terms ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index bb4817d115..00b85724e7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-40978';
+$wp_version = '4.9-alpha-40979';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.