From 1f9eee5410daa0c25fccbcf7256bef48c6a34401 Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Sat, 27 Nov 2021 15:23:59 +0000
Subject: [PATCH] Taxonomy: Check $term object before using it in
 `get_term_feed_link()`.

This change performs the type safety check on `$term` before it is used to retrieve the taxonomy in `get_term_feed_link()`. It also updates the related DocBlock after [52255].

Follow up to [52255].

Props dlh.
Fixes #50225.

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


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

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 6f44ccefe5..afa8933e35 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -923,7 +923,6 @@ function get_category_feed_link( $cat, $feed = '' ) {
  *
  * @param int|WP_Term|object $term     The ID or term object whose feed link will be retrieved.
  * @param string             $taxonomy Optional. Taxonomy of `$term_id`.
- *                                     Defaults to 'category' if term ID or non WP_Term object is passed.
  * @param string             $feed     Optional. Feed type. Possible values include 'rss2', 'atom'.
  *                                     Default is the value of get_default_feed().
  * @return string|false Link to the feed for the term specified by $term_id and $taxonomy.
@@ -935,12 +934,12 @@ function get_term_feed_link( $term, $taxonomy = '', $feed = '' ) {
 
 	$term = get_term( $term, $taxonomy );
 
-	$taxonomy = $term->taxonomy;
-
 	if ( empty( $term ) || is_wp_error( $term ) ) {
 		return false;
 	}
 
+	$taxonomy = $term->taxonomy;
+
 	if ( empty( $feed ) ) {
 		$feed = get_default_feed();
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 59043e6a89..47d5154a0f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-alpha-52257';
+$wp_version = '5.9-alpha-52258';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.