From edd2ca2b6b6e53c97d1f309eb6906f8c3d1d4042 Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Fri, 26 Nov 2021 11:43:03 +0000
Subject: [PATCH] Taxonomy: Use `WP_Term` object to retrieve the taxonomy in
 `get_term_feed_link()`.

This change fixes a backward compatibility issue introduced in [52180] where `get_term_feed_link()` did not honor the `$taxonomy` parameter anymore. Rather than using the default `category` taxonomy when passing a term ID in `get_term_feed_link()`, use the `WP_Term` object to get the taxonomy.

Follow-up to [52180].

Props hugod.
Fixes #50225.

Built from https://develop.svn.wordpress.org/trunk@52255


git-svn-id: http://core.svn.wordpress.org/trunk@51847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/link-template.php | 7 +++----
 wp-includes/version.php       | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index d3316b0eab..6f44ccefe5 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -930,14 +930,13 @@ function get_category_feed_link( $cat, $feed = '' ) {
  */
 function get_term_feed_link( $term, $taxonomy = '', $feed = '' ) {
 	if ( ! is_object( $term ) ) {
-		$term     = (int) $term;
-		$taxonomy = 'category';
-	} elseif ( ! $term instanceof WP_Term ) {
-		$taxonomy = $term->taxonomy;
+		$term = (int) $term;
 	}
 
 	$term = get_term( $term, $taxonomy );
 
+	$taxonomy = $term->taxonomy;
+
 	if ( empty( $term ) || is_wp_error( $term ) ) {
 		return false;
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f0486610ee..140c8b8d90 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-alpha-52254';
+$wp_version = '5.9-alpha-52255';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.